Updating entitys. refactoring service slightly. adding config to declare services