Adding better checks for context in routing, could add some different "types" now