ExpandingService

Added additional database ORM logic