- Adding Source as a dependency
- Simplifying calls to persist services
- Map is not always set
- More use of persist service getter