Better support for using the REPL