Updated controller and binding