Refactor importing of Named Scopes