Enhanced grammar