diff --git a/moo/moopython/plugins/pycmd.py b/moo/moopython/plugins/pycmd.py
index 5a4c19ad..a37522ce 100644
--- a/moo/moopython/plugins/pycmd.py
+++ b/moo/moopython/plugins/pycmd.py
@@ -16,6 +16,9 @@ class PyCmd(moo.edit.Command):
         dic = {}
         dic['doc'] = ctx.get_doc()
         dic['window'] = ctx.get_window()
+        dic['buffer'] = ctx.get_doc() and ctx.get_doc().get_buffer()
+        dic['editor'] = moo.edit.editor_instance()
+        dic['moo'] = moo
 
         ctx.foreach(self.__set_variable, dic)