Add Missing headers and reroute to new locations