Refactored SelectionStrategies