Changed client impl