Updated JSON format and removed global option
Fixed merge issue do to premature commit