Code updates around InterpreterKey