More aggregate changes for performance