Added JAXB Serializable support