DDL generator
Merge branch 'ddl-gen'