Refactoring product selection process

Minimal changes in the way in which the selected products are stored.