Updated version
Added jaxb annotation to support JSON generation for the public api,
that will be in development.