NXP-15011: change way of accessing available aggregate results with a map
NXP-14879: change aggregate descriptor to nest property inside properties