Refactor AbstractClientHandle a bit