added ejson support