Fix and add methods to the client