Headers updates
Added JAXB annotations