Refactored StudentMaterialSelector