Rework to make Radagast repl-usable