Refactoring - introduced parsing scopes