Fixed Jaxb java.util.Map problem, previous solution was more verbose
then this one.