Additional refactoring for selector extension support