In the present paper we show how to extend any time-homogeneous short-rate model and analytically tractable short-rate model (such as Vasicek (1977), Cox-Ingersoll-Ross (1985), Dothan (1978)) to a model which can reproduce any observed yield curve, through a procedure that preserves the possible...