Collections and internal use of ioc container

- [ ] - #38