Added list option in json_generator and added _ in name