Makes Router implementation less hacky