Refactored Addon/Discount to remove duplications