[WIP] Change to XML Mappings

Implements XML mappings