AI-616 Add partial JAXB hierarchy