Added more stuff to routing