Added Client classes