Add support for national aggregates