Nitpick, but do we really want to expose generic aggregates from this module?