Updated JSON format and removed global option