Refactor
Allow for xml model/mapping definition