Some changes in RESTController