Added helper class for clients