Further work on CDS Swaption calculator