Added client controller and enhancements