Modified to controller templates