[#1] Added AggregateResolver