Started adding support for DDL recreation