Core: Improved Xml
Plugin: Improved OSMEngine