Adding the feature to handle scopes based on each application

Redundant `self` detected.