refactoring selectors
SingletonSelector created