diff --git a/bblfsh/__init__.py b/bblfsh/__init__.py
index ab5cf47..58fdb15 100644
--- a/bblfsh/__init__.py
+++ b/bblfsh/__init__.py
@@ -3,4 +3,4 @@
 from bblfsh.tree_order import TreeOrder
 from bblfsh.aliases import *
 from bblfsh.roles import role_id, role_name
-from bblfsh.context import context
+from bblfsh.result_context import context
diff --git a/bblfsh/context.py b/bblfsh/context.py
deleted file mode 100644
index 9d31246..0000000
--- a/bblfsh/context.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from bblfsh.aliases import ParseResponse
-from bblfsh.pyuast import decode, iterator, uast
-from bblfsh.tree_order import TreeOrder
-
-# Python context
-class Context:
-    def __init__(self, root: dict) -> None:
-        self.ctx = uast()
-        self.root = root
-
-    def filter(self, query: str) -> dict:
-        return self.ctx.filter(query, self.root)
-
-    def iterate(self, order: int) -> iterator:
-        TreeOrder.check_order(order)
-        return iterator(self.root, order)
-
-    def encode(self, fmt: int):
-        encoded = self.ctx.encode(self.root, fmt)
-        return encoded
-
-def context(root: dict) -> Context:
-    return Context(root)
diff --git a/bblfsh/result_context.py b/bblfsh/result_context.py
index b3dc86b..10d2e6e 100644
--- a/bblfsh/result_context.py
+++ b/bblfsh/result_context.py
@@ -40,6 +40,11 @@ def iterate(self, order: int) -> NodeIterator:
         TreeOrder.check_order(order)
         return NodeIterator(iterator(self.ctx.root(), order), self.ctx)
 
+    # Encode in binary format by default
+    def encode(self, node: dict = None, fmt: int = 0):
+        encoded = self.ctx.encode(node, fmt)
+        return encoded
+
     @property
     def language(self) -> str:
         return self._response.language
@@ -65,3 +70,25 @@ def __str__(self) -> str:
 
     def __repr__(self) -> str:
         return repr(self.get_all())
+
+
+# Python context
+class Context:
+    def __init__(self, root: dict) -> None:
+        self.ctx = uast()
+        self.root = root
+
+    def filter(self, query: str) -> dict:
+        return self.ctx.filter(query, self.root)
+
+    def iterate(self, order: int) -> iterator:
+        TreeOrder.check_order(order)
+        return iterator(self.root, order)
+
+    def encode(self, fmt: int = 0):
+        encoded = self.ctx.encode(self.root, fmt)
+        return encoded
+
+
+def context(root: dict) -> Context:
+    return Context(root)
diff --git a/bblfsh/test.py b/bblfsh/test.py
index 4a06838..0a82082 100644
--- a/bblfsh/test.py
+++ b/bblfsh/test.py
@@ -407,15 +407,22 @@ def testSupportedLanguages(self) -> None:
 
     def testEncode(self) -> None:
         ctx = self._parse_fixture()
+        # This test is here for backward compatibility purposes,
+        # in case someone was relying on encoding contexts this way
         self.assertEqual(ctx.ctx.encode(None, 0), ctx._response.uast)
+        self.assertEqual(ctx.encode(), ctx._response.uast)
 
     def testEncodeWithEmptyContext(self) -> None:
         ctx = ResultContext()
         obj = {"k1": "v1", "k2": "v2"}
         fmt = 1 # YAML
 
+        # This test is here for backward compatibility purposes,
+        # in case someone was relying on encoding contexts this way
         data = ctx.ctx.encode(obj, fmt)
-        self.assertDictEqual(obj, decode(data, format=fmt).load())
+        other_data = ctx.encode(obj, fmt)
+        self.assertDictEqual(obj, decode(data, format = fmt).load())
+        self.assertDictEqual(obj, decode(other_data, format = fmt).load())
 
     def testGetAll(self) -> None:
         ctx = self._parse_fixture()
@@ -560,16 +567,17 @@ def testPythonContextFilter(self) -> None:
         for nodeC, nodePy in zip(itC, itPy):
             self.assertEqual(nodeC.get(), nodePy)
 
-    def testEncodeDecodePythonContext(self) -> None:
+    def testBinaryEncodeDecodePythonContext(self) -> None:
+        # Binary encoding should be invertible
         # C++ memory context
         ctxC = self._parse_fixture()
         # Python memory context
         pyDict = ctxC.root.get()
         ctxPy = bblfsh.context(pyDict)
-        encoded = ctxPy.encode(fmt = 1) # YAML
-        decoded = decode(encoded, format = 1)
+        encoded = ctxPy.encode(fmt = 0) # Binary encoding
+        decoded = decode(encoded, format = 0)
 
-        self.assertEqual(encoded, decoded.load())
+        self.assertEqual(pyDict, decoded.load())
 
 if __name__ == "__main__":
     unittest.main()