Moved aggregates to wrapped