Product as set functionality added