refactored aggregate retrieval