refactoring to take into account new model for selection items