Refactor product lookup