JAXB and JSON changes for REST Services