Make ToMap and AggregatesMap public
remove extra ?