Updates to Domain, JAXB and Jackson