Changed mapping to XML