Added simple aggregates support (non-grouped)