Refactor selection methods