Added generic pension annuity calculator