extended the model and added jaxb annotations