Refactored SelectionModule.java