Add preliminary m2m support for aggregates