Update grammar as per announcement