Add wrapper for JAXB
Some changes in mongoDB