Offert and JAXB improvements. (Xml adnotations)