Adhere to Template Engine version 2