Upgraded json-mode