Updated router and loader