Major product search and model refactoring