moved ORM logic into Service Objects