Add checks on DateOfAggregation