Add better REPL support