Added aggregator map and math utils