Fix for router BC break and updated base config.