First round of refactoring for DDL/DML/SPL deployment