Added json_generator