Added handling for gherkin keywords