Added to the client class