Refactoring, made it easier to add more supported vendor and product ids