Refactored usage of services and references to aggregates and entities