Copied over modified files from SimpleRouter