Made grammar more compatible with concurrency workbench