Updated annotations in the ClientImpl
updated annotations in the Client Interface