Better product add-on functionality