Added support for aggregate