Updated routing and configs