Moving more logic from the DDO to service