Major coupon types refactoring.