Product refactoring, updated csv