Add suggestion support
Move redirecting jumps into separate package