Still migrating template mananagement