Updates to routing and controllers