Refactor addProducts(...) methods