Finetuned mappers and JAXB, fixed REST