[WIP] Support for handling defunct routes