Adding user_client/base