Refactored XmlDeserializer, added test for custom fields
Added custom fields