some fix in database model dependencies
hope the rest also no problem. will test as we do the controller services
s