Additions to the grammar - and manual id checks