Added client class, for multiple config support