Fixed the types in Client class