Add new methods to the client. Refactor code.