some more changes in v3.0
commit with recovered DiscountGroup and UserGroupDiscount