Lots more JAXB classes mapped. Stuck on Shape.