Updating modules

- Added container args
- Removed unnecessary aggregates