Updated and refractored client classes