Added controller template stuff