Default products + refactoring