Refactoring local contexts towards EBNF layer
Refactoring local contexts towards EBNF layer