Refactor DDL creation, refs #13