added yield curve support