Everythings works! (including Aggregates), improving efficiency