Added client and controller