Added better json awareness