Multiple fixes and improvements

- Added bit more structure to models
- Better error handling in service_v2
- Tiny refactoring
- Fixed test case for service_v2