Moved gift_card related fields to varient level