We're using the same aggregation queries for the Raster and Vector cases, so we don't need the class hierarchies used to handled them differently. AggregationProxy has been renamed to Aggregation
