Template updates and additional controllers