WIP: Add support for aggregate counts