- added __tojson support