- Added TODO
- Generic Jackson annotation on entities for unmarshalling.