Moved requests under client to make them local in scope of the client