Fix object/json type mapping

/to @ritch 

Fix mapping issue for type Object