Get ready for V2 templates