SIS: selector refactor