--- a/entity.py	Thu Jan 10 18:31:43 2013 +0100
+++ b/entity.py	Thu Jan 17 18:30:08 2013 +0100
@@ -579,8 +579,10 @@
         """custom json dumps hook to dump the entity's eid
         which is not part of dict structure itself
         """
+        self.complete()
         dumpable = self.cw_attr_cache.copy()
         dumpable['eid'] = self.eid
+        dumpable['__cwetype__'] = self.__regid__
         return dumpable
 
     def cw_adapt_to(self, interface):