Fixed entity.xtext and finished Entity Scope Provider