More products refactoring