Adapters for using classes as XML attributes in JAXB
Add JAXB attributes

Also fixes indentation