- Adding validation
- Update to configuration
- Renaming of classes
- Small bits and bobs