added jaxb mapings and some meat