+ Added support for AggregationPeriod.HOUR