Got rid of Router dependency