Add support for un-decomposable aggregation functions
Add missing @Override annotations