Added json-mode