Updated Client classes