Client class added

refactoring