Refactored selections package