Refactor ProductFamily