ENG-4291 (partial) refactoring: DDL XML