Add routes and other changes