Changed schema to include root element
Merge branch 'dev'