--- a/entity.py	Thu Jan 17 14:40:57 2013 +0100
+++ b/entity.py	Thu Jan 17 14:39:51 2013 +0100
@@ -539,8 +539,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):