Updated build with router update