Added more features to discount system