Updated Router component