WIP: Group by entity (domain service)