Updates to controller and webservice