Updates to routes and controller