Add XML capabilities to mapper