Updated unmarshaller to work with all xml files