Fixing up DDL and adding XSD
Failed merge
Fixing up DDL and adding XSD