XML Mapping package fix