Added fixes for the REST service and added a @ManagerFor annotation for model objects