MPS-20295 - organized scopes for different types of property references