Migrating to new dltk