Added client stuff