Refactor/product profile