Shameless plug, but at www.salesbricks.com we separate out billing schedule and contract terms. We also handle complex deal structures, upgrades and renewals!