Aggregated Domain Model, Updated to JAXB and Jackson 2