add parametric beta termstructure, reformatting