added json and jaxb