Updates

- Optimize collections
- Dependencies
- Update unit tests