Markup and grammar updates