Added aggregates and name/id switch