Use Client class properly