Added initial client class