Added client functionality