Reformatted and added missing XmlAdapter to marshaller