Update grammar and code examples