We present a flexible approach for the valuation of interest rate derivatives based on Affine Processes. We extend the methodology proposed in Keller-Ressel et al. (2009) by changing the choice of the state space. We provide semi-closed-form solutions for the pricing of caps and floors. We then...