(FACT-65) Add aggregate resolution class