Add products rehaul