Updated routes and controllers