@gklopper this feels slightly dirty, and think it *should* be moved into a sperate model file, which will also have benifits when we add more XML schema's in the future... Thoughts?