XML Serialization Refactor