Improve imports
Improve aggregation & add tests for it