Update to Controller (v2 which has no ControlHelper)