Xml changed to JAXB