Added Routers and states