diff --git a/.Rbuildignore b/.Rbuildignore
index eae2540e7c59683aba5458a1c295f9de908e33d1..49036fa4013d7cdbc0dc2331414d78c21cb6c8a8 100644
--- a/.Rbuildignore
+++ b/.Rbuildignore
@@ -2,3 +2,4 @@
 ^\.Rproj\.user$
 ValuationTables.RData
 data.saved
+data-raw
diff --git a/R/ages.R b/R/ages.R
index d1b129584c5a404406e593ef07468b7868fc1353..14324dfff986e821ddfcbaf616aaa0cdd9ccd8db 100644
--- a/R/ages.R
+++ b/R/ages.R
@@ -9,25 +9,25 @@ NULL
 #' @exportMethod ages
 setGeneric("ages", function(object, ...) standardGeneric("ages"));
 
-#' @describeIn ages Return the defined ages of the life table
+#' @describeIn ages Return the defined ages of the period life table
 setMethod("ages", "valuationTable.period",
           function (object, ...) {
               object@ages;
           })
 
-# @describeIn ages Return the defined ages of the life table
+#' @describeIn ages Return the defined ages of the mixed life table
 setMethod("ages", "valuationTable.mixed",
           function (object, ...) {
               ages(object@table1);
           })
 
-# @describeIn ages Return the defined ages of the life table
+#' @describeIn ages Return the defined ages of the joined life table
 setMethod("ages", "valuationTable.joined",
           function (object, ...) {
               ages(object@table1);
           })
 
-#' @describeIn ages Return the defined ages of the life table
+#' @describeIn ages Return the defined ages of the observed life table
 setMethod("ages", "valuationTable.observed",
           function (object, ...) {
               object@ages;
diff --git a/R/plotValuationTableComparisons.R b/R/plotValuationTableComparisons.R
index 1825956efb09ff4b66c384a9ef1a99afe3956d93..98f2d6abee7c83b20e226e8fbb32a1cc28b97580 100644
--- a/R/plotValuationTableComparisons.R
+++ b/R/plotValuationTableComparisons.R
@@ -69,3 +69,6 @@ plotValuationTableComparisons = function(
     }
     pl
 }
+
+globalVariables(c("x", "y"))
+
diff --git a/R/plotValuationTables.R b/R/plotValuationTables.R
index 542c49d932f3b2d67be90a6cb7c256d0115c70c4..d77824d37a0c36fde15cd55bf6ae4efad0ddea3c 100644
--- a/R/plotValuationTables.R
+++ b/R/plotValuationTables.R
@@ -57,6 +57,8 @@ plotValuationTables = function(data, ..., xlim=NULL, ylim=NULL, xlab=NULL, ylab=
   pl
 }
 
+globalVariables(c("x", "y", ".x"))
+
 
 #
 # plotValuationTables(mort.AT.census.1869.male, mort.AT.census.1869.female, mort.AT.census.2011.male, mort.AT.census.2011.female, AVOe2005R.male, AVOe2005R.female, YOB=1972,title="Vergleich österreichische Sterbetafeln, YOB=1972 (bei Generationentafeln)")
diff --git a/R/valuationTables.load.R b/R/valuationTables.load.R
index 17c4f63037fec66169ff17836336f3d44eacf8c5..873c6e849d59d00b514a6119d4e26ab886ed116c 100644
--- a/R/valuationTables.load.R
+++ b/R/valuationTables.load.R
@@ -1,6 +1,9 @@
 #' Load a named set of life tables provided by the \link{ValuationTables} package
 #'
-#' @param dataset The set of life tables to be loaded. A list of all available data sets is provided by the
+#' @param dataset The set of life tables to be loaded. A list of all available
+#'                data sets is provided by the
+#' @param wildcard Whether the dataset name contains wildcard. If TRUE, all
+#'                 datasets matching the pattern will be loaded
 #'
 #' @export
 valuationTables.load = function(dataset, wildcard=FALSE) {
diff --git a/data-raw/Germany_Annuities_DAV1994R.R.xlsx b/data-raw/Germany_Annuities_DAV1994R.R.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..5ee80fa81e16293a8f682b97f37d23d7f9cf51e9
Binary files /dev/null and b/data-raw/Germany_Annuities_DAV1994R.R.xlsx differ
diff --git a/data-raw/Germany_Annuities_DAV_2004R.xlsx b/data-raw/Germany_Annuities_DAV_2004R.xlsx
new file mode 100644
index 0000000000000000000000000000000000000000..b1d0a13aa1f495492ccf6829599e5d9454b0492b
Binary files /dev/null and b/data-raw/Germany_Annuities_DAV_2004R.xlsx differ
diff --git a/data/ValuationTables_Germany_Annuities.R b/data/ValuationTables_Germany_Annuities.R
deleted file mode 100644
index 8b55e007160508d589bf949e46c828da14dfbbab..0000000000000000000000000000000000000000
--- a/data/ValuationTables_Germany_Annuities.R
+++ /dev/null
@@ -1,92 +0,0 @@
-# frame_files = lapply(sys.frames(), function(x) x$ofile)
-# frame_files = Filter(Negate(is.null), frame_files)
-# PATH <- dirname(frame_files[[length(frame_files)]])
-# rm(frame_files)
-#
-# setwd(dirname(PATH))
-
-library("gdata")
-library("ValuationTables")
-
-
-###############################################################################
-# DAV 1994R exact (Male, Female), 1st-order only
-###############################################################################
-
-DAV1994R.exakt.data=read.xls(
-  "Tables/DAV_R.xls",
-  sheet="DAV 1994R", skip=2, #row.names=1,
-  col.names=c("age",
-              "qx2000", "qy2000", "trendM", "trendF", "qxAVbase1955", "qyAVbase1955",
-              "", "", "", "", "", "")
-);
-
-DAV1994R.male=valuationTable_trendProjection(
-  name="DAV 1994R male",
-  ages=DAV1994R.exakt.data$age, baseYear=2000,
-  deathProbs=DAV1994R.exakt.data$qx2000,
-  trend=DAV1994R.exakt.data$trendM
-);
-DAV1994R.female=valuationTable_trendProjection(
-  name="DAV 1994R female",
-  ages=DAV1994R.exakt.data$age, baseYear=2000,
-  deathProbs=DAV1994R.exakt.data$qy2000,
-  trend=DAV1994R.exakt.data$trendF
-);
-
-
-###############################################################################
-# DAV 2004R exact (Male, Female), 1st-order only
-###############################################################################
-
-DAV2004R.data.basistafeln=read.xls(
-  "Tables/DAV_2004_R.xls",
-  sheet="Basistafeln", skip=3, #row.names=1,
-  col.names=c("age",
-              "qxSel2Ord", "qySel2Ord", "qxAgg2Ord", "qyAgg2Ord",
-              "qxSelBestand", "qySelBestand", "qxAggBestand", "qyAggBestand",
-              "qxSel", "qySel", "qxAgg", "qyAgg")
-);
-DAV2004R.data.trend=read.xls(
-  "Tafeln/DAV_2004_R.xls",
-  sheet="Trends", skip=4, header=FALSE, #row.names=1,
-  col.names=c("age",
-              "trend2Ord.male.start", "trend2Ord.female.start",
-              "trend2Ord.male.end", "trend2Ord.female.end",
-              "trendBestand.male.start", "trendBestand.female.start",
-              "trendBestand.male.end", "trendBestand.female.end",
-              "trend1Ord.male", "trend1Ord.female")
-);
-DAV2004R.data.select=read.xls(
-  "Tafeln/DAV_2004_R.xls",
-  sheet="Selektionsfaktoren", skip=2, header=FALSE, #row.names=1,
-  col.names=c("year", "SelectMale", "SelectFemale")
-);
-DAV2004R.data.av.grundtafeln=read.xls(
-  "Tafeln/DAV_2004_R.xls",
-  sheet="Grundtafeln", skip=3, #row.names=1,
-  col.names=c("age",
-              "qxBestand", "qyBestand",
-              "qxB20", "qyB20",
-              "qx1Ord", "qy1Ord")
-);
-DAV2004R.data.av=read.xls(
-  "Tafeln/DAV_2004_R.xls",
-  sheet="Altersverschiebungen", skip=1, row.names=1,
-  col.names=c("YOB", "shiftMBestand", "shiftFBestand",
-              "shiftMB20", "shiftFB20",
-              "shiftM1Ord", "shiftF1Ord")
-);
-
-DAV2004R.male=valuationTable_trendProjection(
-  name="DAV 2004R male",
-  ages=DAV2004R.exakt.data$age, baseYear=2000,
-  deathProbs=DAV2004R.exakt.data$qx2000,
-  trend=DAV2004R.exakt.data$trendM
-);
-DAV2004R.female=valuationTable_trendProjection(
-  name="DAV 2004R female",
-  ages=DAV2004R.exakt.data$age, baseYear=2000,
-  deathProbs=DAV2004R.exakt.data  $qy2000,
-  trend=DAV2004R.exakt.data$trendF
-);
diff --git a/inst/extdata/Germany_Annuities_DAV1994R.csv b/inst/extdata/Germany_Annuities_DAV1994R.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ee90f0a899bf2ab7d74a4c0a5c36b74f6765fa87
--- /dev/null
+++ b/inst/extdata/Germany_Annuities_DAV1994R.csv
@@ -0,0 +1,115 @@
+"DAV 1994 R, Trend und AV",,,,,,,YOB:,1935,Interest:,,4%,0.961538461538461,<=v
+,qbar_x^B (2000),,Fbar(x),,AV Grundtafel 1955,,,Sterblichkeiten,,,sof.beg.LR,,
+x,Basis M,Basis F,Trend M,Trend F,AV Basis M 1955,AV Basis F 1955,Age,qx,qy,Alter,äx,äy,
+0,0.003691,0.002509,0.048333,0.050169,0.000113,0.000059,0,0.0854167676517212,0.0654226983214743,0,22.3704929267759,23.2827661246754,
+1,0.000154,0.000083,0.048333,0.050169,0.000113,0.000059,1,0.00339569795615305,0.00205834307949996,1,24.3010278974625,24.7963188577779,
+2,0.000125,0.000064,0.043688,0.046174,0.000113,0.000059,2,0.00195991765248229,0.00117361626213733,2,24.3156375741742,24.7992169085898,
+3,0.000079,0.000048,0.041833,0.04489,0.000113,0.000059,3,0.00105689839187685,0.000776177329060597,3,24.2958810032019,24.7802681105681,
+4,0.000075,0.000036,0.039661,0.043984,0.000113,0.000059,4,0.000842866947616613,0.000526653553410943,4,24.2533495694876,24.7506897592605,
+5,0.00006,0.000029,0.037158,0.042282,0.000113,0.000059,5,0.000557701884374774,0.000366579652278056,5,24.2038842062685,24.7137329248939,
+6,0.000052,0.000026,0.035218,0.040662,0.000113,0.000059,6,0.000415343429338061,0.000286332733381256,6,24.145505568474,24.6713262480869,
+7,0.000048,0.000026,0.033511,0.039605,0.000113,0.000059,7,0.000335237424587992,0.000258575194127223,7,24.0813278124896,24.6252303075145,
+8,0.000046,0.000025,0.032248,0.03813,0.000113,0.000059,8,0.000289101372495908,0.000219705019208769,8,24.0126308575155,24.5765944174876,
+9,0.000046,0.000024,0.031145,0.037086,0.000113,0.000059,9,0.000263159785332922,0.000191496557191715,9,23.9400571952088,24.5250464699928,
+10,0.000045,0.000023,0.030302,0.03652,0.000113,0.000059,10,0.000238238551704042,0.000171416148314454,10,23.8639395122164,24.4707343901802,
+11,0.000044,0.000021,0.029313,0.035557,0.000113,0.000059,11,0.00021423887566616,0.000143251301020826,11,23.7841633973464,24.4137486765515,
+12,0.000045,0.00002,0.027834,0.034881,0.000113,0.000059,12,0.00019673634651029,0.000127030253363953,12,23.7006075247489,24.3537873353341,
+13,0.00005,0.00002,0.02614,0.032956,0.000114,0.000059,13,0.000194669452613445,0.000110990462428601,13,23.6132774156668,24.2910245237472,
+14,0.000062,0.000021,0.024785,0.032708,0.000133,0.000059,14,0.000219459868649375,0.00011134466022967,14,23.5223876026122,24.225354287972,
+15,0.000083,0.000026,0.024785,0.032518,0.000175,0.000068,15,0.000286600886283934,0.000132157783463951,15,23.4284247057253,24.1570582189304,
+16,0.000115,0.000033,0.024785,0.032518,0.000235,0.000085,16,0.000387376515512876,0.000162371928945537,16,23.3322487371214,24.0865237692804,
+17,0.000154,0.000044,0.024785,0.032518,0.000309,0.00011,17,0.000506048544490314,0.000209569124310736,17,23.2345392014416,24.013883900702,
+18,0.000197,0.000057,0.024785,0.032518,0.000385,0.00011,18,0.000631500496957506,0.000262801046267775,18,23.135628520638,23.9394562276082,
+19,0.000235,0.000068,0.024785,0.032518,0.000447,0.00011,19,0.000734871397226632,0.000303486068054112,19,23.0356006547247,23.8633057784385,
+20,0.000275,0.000073,0.024785,0.032518,0.000511,0.000111,20,0.000838903848726264,0.000315377218414581,20,22.9338781319804,23.7850564428343,
+21,0.00034,0.000073,0.024785,0.032518,0.000617,0.000111,21,0.00101179940885842,0.000305286732380026,21,22.830385755738,23.7039343814384,
+22,0.000439,0.000073,0.024785,0.032518,0.000777,0.000111,22,0.001274430145625,0.000295519091187991,22,22.7265959423073,23.6193024163517,
+23,0.000485,0.000072,0.024785,0.032518,0.000786,0.000112,23,0.00137350190285118,0.00028214528096811,23,22.6244931160562,23.5310283811277,
+24,0.000495,0.00007,0.024785,0.032518,0.000795,0.000112,24,0.00136750441466984,0.000265531437424116,24,22.520404659351,23.438882686514,
+25,0.000499,0.000066,0.024785,0.032518,0.000804,0.000112,25,0.00134480741478653,0.000242348007826975,25,22.411869175764,23.3426361977174,
+26,0.000508,0.000063,0.024785,0.032518,0.000813,0.000112,26,0.00133554729760804,0.000223930721811481,26,22.2983309035309,23.2419742917937,
+27,0.000521,0.000063,0.024785,0.032518,0.000814,0.000113,27,0.00133619331669439,0.000216766064096172,27,22.1798864270511,23.1368343114732,
+28,0.000546,0.000068,0.024785,0.032514,0.000832,0.000118,28,0.0013660299643776,0.000226450347640393,28,22.0565537037814,23.027299220951,
+29,0.00058,0.000085,0.024785,0.0325,0.000863,0.000143,29,0.00141557077533757,0.000273869374274922,29,21.9287712104882,22.9135799779408,
+30,0.000617,0.000124,0.024785,0.032406,0.000894,0.000202,30,0.00146901005935203,0.000385480869112649,30,21.7967769393396,22.7963664036611,
+31,0.00066,0.000189,0.024785,0.032215,0.000934,0.000297,31,0.00153292021885197,0.000565130690523684,31,21.6604674615044,22.6769625950575,
+32,0.00072,0.000235,0.024785,0.031974,0.000994,0.000357,32,0.00163133864606544,0.000675010005782509,32,21.5198744105557,22.5567886323957,
+33,0.00079,0.000264,0.024785,0.031695,0.001063,0.000386,33,0.0017461225893248,0.000727918508564697,33,21.3755401316752,22.4342034895187,
+34,0.000844,0.000286,0.024785,0.031351,0.001109,0.000404,34,0.00181981021033204,0.000755872575328076,34,21.227627777322,22.3078098968089,
+35,0.000879,0.000312,0.024785,0.030979,0.001112,0.000425,35,0.00184887920193123,0.000790268837187553,35,21.075085544272,22.176885192004,
+36,0.000899,0.000342,0.024785,0.030442,0.001115,0.000449,36,0.00184465589899665,0.000826854495567889,36,20.91676153141,22.0413792148063,
+37,0.000917,0.000375,0.024785,0.029814,0.001118,0.000475,37,0.00183552802705006,0.000864125511307219,37,20.7517117601791,21.9011434423119,
+38,0.000943,0.000414,0.024705,0.029135,0.001121,0.000507,38,0.00183738984801838,0.000909150797106622,38,20.5795545798017,21.7559890851966,
+39,0.000988,0.000466,0.024573,0.028507,0.001145,0.000553,39,0.00187165940319805,0.000977861098745547,39,20.4002199199721,21.6058716440318,
+40,0.00106,0.000541,0.02442,0.027775,0.001198,0.000622,40,0.0019518329552477,0.00108332931654749,40,20.2140625570327,21.4510826890808,
+41,0.001162,0.00064,0.024175,0.02688,0.00128,0.000713,41,0.00207579177337319,0.00121997808732102,41,20.0217040811598,21.2921924529418,
+42,0.001297,0.000731,0.023854,0.025955,0.001394,0.00079,42,0.00224497841249829,0.00132793244597766,42,19.8237221637915,21.1296578706543,
+43,0.001451,0.000816,0.023489,0.024926,0.001521,0.000857,43,0.00243272243510889,0.00141203379932274,43,19.6207191412529,20.9626812100139,
+44,0.001638,0.000907,0.023111,0.023929,0.001676,0.000929,44,0.00266127940219884,0.00149914683725818,44,19.4127737972473,20.7905454112415,
+45,0.001864,0.001018,0.022664,0.023099,0.001864,0.001018,45,0.00293293819139557,0.00161578340269244,45,19.2003823311494,20.6130692452564,
+46,0.002085,0.001142,0.022022,0.022427,0.002039,0.001117,46,0.00316827366777364,0.00174873752137769,46,18.9840767481184,20.4306034450201,
+47,0.002297,0.00123,0.021325,0.021929,0.002201,0.001177,47,0.00337182426796841,0.00182528505504822,47,18.7628857749754,20.2432276746093,
+48,0.002507,0.001283,0.020724,0.021594,0.002356,0.001202,48,0.0035658227732599,0.00185206102331175,48,18.5359010068178,20.0495529309189,
+49,0.002728,0.00132,0.020176,0.021385,0.002516,0.001212,49,0.00376739861214749,0.00185854093548024,49,18.3026008781116,19.8482953022641,
+50,0.002952,0.001369,0.019582,0.021238,0.002677,0.001231,50,0.00395987677254581,0.00188259387435964,50,18.0627545095068,19.6387264914598,
+51,0.003174,0.001437,0.019057,0.021162,0.002831,0.001266,51,0.00414453509600161,0.00193252146172489,51,17.8158131144229,19.4208371000777,
+52,0.003433,0.001536,0.018511,0.021162,0.003016,0.001324,52,0.00436700541496165,0.0020224054802161,52,17.5612287679575,19.1947648791626,
+53,0.003762,0.001662,0.017991,0.021162,0.003258,0.001403,53,0.00466852292209714,0.00214248355625446,53,17.2992237223459,18.9609021066594,
+54,0.004162,0.001804,0.017503,0.021162,0.003555,0.001491,54,0.00504566131250636,0.00227683978352737,54,17.0307008887181,18.7194442925047,
+55,0.004626,0.001953,0.017079,0.021162,0.0039,0.001581,55,0.00548755369768889,0.00241327959904982,55,16.7564764291192,18.4702759232396,
+56,0.005131,0.002108,0.016603,0.021162,0.004274,0.00167,56,0.00595795661202832,0.00255026590621037,56,16.4771547578025,18.2130401183235,
+57,0.005666,0.002276,0.016001,0.021162,0.004676,0.001766,57,0.00643976083116212,0.00269585529126879,57,16.1927164501555,17.9473321924542,
+58,0.006199,0.002456,0.015535,0.021162,0.005065,0.001866,58,0.00691112884719342,0.00284814529936807,58,15.9028355657424,17.6728689774973,
+59,0.00671,0.002633,0.015215,0.021162,0.005422,0.001958,59,0.00735138661830769,0.00298946930150633,59,15.6068096608317,17.389311021041,
+60,0.007196,0.00283,0.014891,0.021162,0.005755,0.00206,60,0.00775222823386637,0.00314585814068042,60,15.3035846144115,17.0959914033618,
+61,0.007709,0.003083,0.014604,0.021103,0.006102,0.002199,61,0.00817274205555274,0.00335454166611148,61,14.9919490093792,16.7926583805665,
+62,0.008288,0.003406,0.014326,0.021026,0.006496,0.002383,62,0.00865196692715569,0.00362776436900724,62,14.671533629669,16.4796463762009,
+63,0.008988,0.003797,0.014117,0.020939,0.006971,0.002605,63,0.00924538357823671,0.00395938726110384,63,14.34248568667,16.1574476441063,
+64,0.009859,0.004285,0.013996,0.020813,0.007557,0.002885,64,0.00999795671476775,0.00437511826764924,64,14.0056729326707,15.8264084297965,
+65,0.010928,0.004884,0.013796,0.020572,0.008293,0.003237,65,0.010928,0.004884,65,13.6624969026257,15.4872232001264,
+66,0.012201,0.005629,0.013556,0.020485,0.009178,0.003661,66,0.0120367192546405,0.00551486297477926,66,13.3144976085974,15.1406591072111,
+67,0.013603,0.006475,0.01337,0.02032,0.010137,0.004141,67,0.0132440759805995,0.00621713138088734,67,12.9631108387744,14.7878383738244,
+68,0.015087,0.007377,0.013252,0.020185,0.011123,0.004637,68,0.0144989675850117,0.0069435422287239,68,12.6086248579551,14.4290592659363,
+69,0.01668,0.008338,0.013139,0.020108,0.012169,0.005146,69,0.0158260037941827,0.00769361973443606,69,12.2505907707557,14.0638747447635,
+70,0.018427,0.009379,0.012995,0.019939,0.013316,0.005698,70,0.0172677738366052,0.00848905891192019,70,11.8887660583332,13.6917689987219,
+71,0.020402,0.010529,0.01274,0.019744,0.014649,0.006302,71,0.0189005861584697,0.00935274005963214,71,11.5232984114879,13.3124499303919,
+72,0.022701,0.011845,0.012501,0.01951,0.016198,0.006994,72,0.0207989390122639,0.0103329295330916,72,11.155067665462,12.9258399487002,
+73,0.025416,0.013407,0.012211,0.019129,0.018056,0.007848,73,0.0230505791967179,0.0115045770279701,73,10.7855993961313,12.5323696390107,
+74,0.028607,0.015298,0.011972,0.018717,0.020216,0.00889,74,0.0256849044315236,0.0129263659927076,74,10.4171445883132,12.1332523609576,
+75,0.032237,0.017511,0.011771,0.018356,0.022646,0.010096,75,0.0286572040323879,0.0145744392034596,75,10.0520154274438,11.7302114619246,
+76,0.036221,0.019995,0.011429,0.017831,0.025415,0.011504,76,0.0319419457911435,0.0164338173007829,76,9.69183699474869,11.3244676862057,
+77,0.04059,0.022809,0.011038,0.017091,0.028511,0.0132,77,0.0355544644573907,0.0185795812399227,77,9.33777724924375,10.9168519440014,
+78,0.045418,0.026061,0.010837,0.016469,0.031762,0.015135,78,0.0394497417986459,0.0210382654513496,78,8.99095700031928,10.5087746541808,
+79,0.050779,0.029844,0.010553,0.015889,0.03547,0.017388,79,0.0438046897378122,0.0238918599870594,79,8.65191093269162,10.1016467665178,
+80,0.056731,0.034237,0.010149,0.015192,0.03977,0.020117,80,0.048719813653135,0.0272601773089981,80,8.32255427797195,9.69740159840595,
+81,0.063285,0.039277,0.009894,0.01458,0.044321,0.023237,81,0.0540194590399431,0.0311047053703925,81,8.00548204240008,9.29878416750652,
+82,0.070401,0.044981,0.009668,0.014057,0.04923,0.02674,82,0.0597310190541208,0.0354198068209983,82,7.70174544679531,8.90781035065937,
+83,0.077983,0.051342,0.009409,0.013501,0.05454,0.030737,83,0.0658335017710488,0.0402653432773572,83,7.41257598188097,8.52611615171281,
+84,0.085906,0.058326,0.009106,0.012897,0.060227,0.035271,84,0.0722577563251724,0.0456500619026293,84,7.13906892807637,8.1555466846534,
+85,0.094041,0.065881,0.008746,0.01231,0.066281,0.040263,85,0.0789496934129978,0.051503516366903,85,6.88190252058548,7.79773566798332,
+86,0.102251,0.073958,0.008414,0.011584,0.072418,0.045997,86,0.0856900378874272,0.0579878418043423,86,6.64152498257821,7.45352799582689,
+87,0.110408,0.082525,0.008073,0.010802,0.078658,0.052428,87,0.0924415538905945,0.0650695877329059,87,6.41706448032659,7.12482217694046,
+88,0.118399,0.091566,0.007669,0.010022,0.085141,0.059507,88,0.099253112221218,0.0727154605133424,88,6.20758595073502,6.81314350291808,
+89,0.126129,0.101059,0.007294,0.009283,0.091502,0.067171,89,0.10587394546564,0.0808756269358807,89,6.0126651140809,6.51975632677072,
+90,0.133522,0.110913,0.006861,0.008602,0.098056,0.075313,90,0.112476156647504,0.0894514580696682,90,5.83046617667241,6.24566897372558,
+91,0.140465,0.12084,0.006489,0.007939,0.104216,0.083869,91,0.118657874413795,0.0983028831188938,91,5.66033787302327,5.99143865642697,
+92,0.147006,0.130591,0.006168,0.00738,0.11001,0.092315,92,0.124454153396242,0.106998017018969,92,5.49928483756577,5.75702872450076,
+93,0.153281,0.139987,0.005861,0.006864,0.115695,0.100693,93,0.13008197624372,0.11551005254024,93,5.34438744609346,5.5400883399672,
+94,0.159565,0.14895,0.005568,0.006391,0.121466,0.1089,94,0.135772319665001,0.123751024370913,94,5.19378012703761,5.33832169277503,
+95,0.165956,0.15752,0.00529,0.005963,0.127386,0.116909,95,0.141602338079037,0.131717889443996,95,5.04673876035591,5.1490554465377,
+96,0.172468,0.165792,0.005031,0.005581,0.133438,0.124725,96,0.147562337263842,0.139452353455995,96,4.90286553361751,4.96960332585464,
+97,0.179078,0.174001,0.004792,0.005245,0.13958,0.132466,97,0.153619300192885,0.147115949257863,97,4.76161522701107,4.79739556022099,
+98,0.185753,0.182224,0.004575,0.004958,0.145758,0.140118,98,0.159723282601195,0.15472087692868,98,4.62212788758422,4.63051381860565,
+99,0.192466,0.190467,0.004382,0.004718,0.151914,0.147629,99,0.165824751153217,0.162238415054635,99,4.48306245441253,4.46684919607473,
+100,0.199193,0.198722,0.004211,0.004526,0.158012,0.154934,100,0.171895924571257,0.169609182349977,100,4.34247474687945,4.30375804848208,
+101,0.208221,0.210417,0.004211,0.004526,0.164479,0.163311,101,0.178931672599638,0.17877987063822,101,4.19774982384294,4.13770034228565,
+102,0.217049,0.221987,0.004211,0.004526,0.170732,0.171514,102,0.185734109935074,0.187758548631387,102,4.05040567978824,3.9736098024206,
+103,0.225635,0.23336,0.004211,0.004526,0.17674,0.179486,103,0.19227000293219,0.196486617675866,103,3.89605157932726,3.80743212416273,
+104,0.233937,0.244465,0.004211,0.004526,0.182474,0.187179,104,0.198506699133146,0.20490739582255,104,3.72883717756429,3.63370352424502,
+105,0.24192,0.255237,0.004211,0.004526,0.187907,0.194544,105,0.204418035960522,0.212970258666712,105,3.54087883404321,3.44494672799587,
+106,0.249548,0.265614,0.004211,0.004526,0.193017,0.20154,106,0.209977478863123,0.220628022443971,106,3.32148553743962,3.23081131954188,
+107,0.256791,0.275543,0.004211,0.004526,0.197785,0.208129,107,0.215163999230641,0.227841838230782,107,3.05604573837067,2.97681189359515,
+108,0.263622,0.284974,0.004211,0.004526,0.202193,0.214281,108,0.219959460503388,0.234576074792466,108,2.72450240025862,2.66251717734665,
+109,0.270017,0.293863,0.004211,0.004526,0.206228,0.219967,109,0.224348561373084,0.240800712505151,109,2.29921703483048,2.25890229910401,
+110,0.275955,0.302175,0.004211,0.004526,0.209878,0.225167,110,0.228318779682482,0.246493671505013,110,1.74200117338223,1.72452531586056,
+111,1,1,0,0,1,1,111,1,1,111,1,1,
diff --git a/inst/extdata/Germany_Annuities_DAV1994R.test.csv b/inst/extdata/Germany_Annuities_DAV1994R.test.csv
new file mode 100644
index 0000000000000000000000000000000000000000..48d3326545a2cd6adca605cc8d88073b95c52542
--- /dev/null
+++ b/inst/extdata/Germany_Annuities_DAV1994R.test.csv
@@ -0,0 +1,115 @@
+"DAV 1994 R, Trend und AV",,,,,,,YOB:,1935,Interest:,,4%,"0,961538461538461",<=v
+,qbar_x^B (2000),,Fbar(x),,AV Grundtafel 1955,,,Sterblichkeiten,,,sof.beg.LR,,
+x,Basis M,Basis F,Trend M,Trend F,AV Basis M 1955,AV Basis F 1955,Age,qx,qy,Alter,äx,äy,
+0,"0,003691","0,002509","0,048333","0,050169","0,000113","0,000059",0,"0,0854167676517212","0,0654226983214743",0,"22,3704929267759","23,2827661246754",
+1,"0,000154","0,000083","0,048333","0,050169","0,000113","0,000059",1,"0,00339569795615305","0,00205834307949996",1,"24,3010278974625","24,7963188577779",
+2,"0,000125","0,000064","0,043688","0,046174","0,000113","0,000059",2,"0,00195991765248229","0,00117361626213733",2,"24,3156375741742","24,7992169085898",
+3,"0,000079","0,000048","0,041833","0,04489","0,000113","0,000059",3,"0,00105689839187685","0,000776177329060597",3,"24,2958810032019","24,7802681105681",
+4,"0,000075","0,000036","0,039661","0,043984","0,000113","0,000059",4,"0,000842866947616613","0,000526653553410943",4,"24,2533495694876","24,7506897592605",
+5,"0,00006","0,000029","0,037158","0,042282","0,000113","0,000059",5,"0,000557701884374774","0,000366579652278056",5,"24,2038842062685","24,7137329248939",
+6,"0,000052","0,000026","0,035218","0,040662","0,000113","0,000059",6,"0,000415343429338061","0,000286332733381256",6,"24,145505568474","24,6713262480869",
+7,"0,000048","0,000026","0,033511","0,039605","0,000113","0,000059",7,"0,000335237424587992","0,000258575194127223",7,"24,0813278124896","24,6252303075145",
+8,"0,000046","0,000025","0,032248","0,03813","0,000113","0,000059",8,"0,000289101372495908","0,000219705019208769",8,"24,0126308575155","24,5765944174876",
+9,"0,000046","0,000024","0,031145","0,037086","0,000113","0,000059",9,"0,000263159785332922","0,000191496557191715",9,"23,9400571952088","24,5250464699928",
+10,"0,000045","0,000023","0,030302","0,03652","0,000113","0,000059",10,"0,000238238551704042","0,000171416148314454",10,"23,8639395122164","24,4707343901802",
+11,"0,000044","0,000021","0,029313","0,035557","0,000113","0,000059",11,"0,00021423887566616","0,000143251301020826",11,"23,7841633973464","24,4137486765515",
+12,"0,000045","0,00002","0,027834","0,034881","0,000113","0,000059",12,"0,00019673634651029","0,000127030253363953",12,"23,7006075247489","24,3537873353341",
+13,"0,00005","0,00002","0,02614","0,032956","0,000114","0,000059",13,"0,000194669452613445","0,000110990462428601",13,"23,6132774156668","24,2910245237472",
+14,"0,000062","0,000021","0,024785","0,032708","0,000133","0,000059",14,"0,000219459868649375","0,00011134466022967",14,"23,5223876026122","24,225354287972",
+15,"0,000083","0,000026","0,024785","0,032518","0,000175","0,000068",15,"0,000286600886283934","0,000132157783463951",15,"23,4284247057253","24,1570582189304",
+16,"0,000115","0,000033","0,024785","0,032518","0,000235","0,000085",16,"0,000387376515512876","0,000162371928945537",16,"23,3322487371214","24,0865237692804",
+17,"0,000154","0,000044","0,024785","0,032518","0,000309","0,00011",17,"0,000506048544490314","0,000209569124310736",17,"23,2345392014416","24,013883900702",
+18,"0,000197","0,000057","0,024785","0,032518","0,000385","0,00011",18,"0,000631500496957506","0,000262801046267775",18,"23,135628520638","23,9394562276082",
+19,"0,000235","0,000068","0,024785","0,032518","0,000447","0,00011",19,"0,000734871397226632","0,000303486068054112",19,"23,0356006547247","23,8633057784385",
+20,"0,000275","0,000073","0,024785","0,032518","0,000511","0,000111",20,"0,000838903848726264","0,000315377218414581",20,"22,9338781319804","23,7850564428343",
+21,"0,00034","0,000073","0,024785","0,032518","0,000617","0,000111",21,"0,00101179940885842","0,000305286732380026",21,"22,830385755738","23,7039343814384",
+22,"0,000439","0,000073","0,024785","0,032518","0,000777","0,000111",22,"0,001274430145625","0,000295519091187991",22,"22,7265959423073","23,6193024163517",
+23,"0,000485","0,000072","0,024785","0,032518","0,000786","0,000112",23,"0,00137350190285118","0,00028214528096811",23,"22,6244931160562","23,5310283811277",
+24,"0,000495","0,00007","0,024785","0,032518","0,000795","0,000112",24,"0,00136750441466984","0,000265531437424116",24,"22,520404659351","23,438882686514",
+25,"0,000499","0,000066","0,024785","0,032518","0,000804","0,000112",25,"0,00134480741478653","0,000242348007826975",25,"22,411869175764","23,3426361977174",
+26,"0,000508","0,000063","0,024785","0,032518","0,000813","0,000112",26,"0,00133554729760804","0,000223930721811481",26,"22,2983309035309","23,2419742917937",
+27,"0,000521","0,000063","0,024785","0,032518","0,000814","0,000113",27,"0,00133619331669439","0,000216766064096172",27,"22,1798864270511","23,1368343114732",
+28,"0,000546","0,000068","0,024785","0,032514","0,000832","0,000118",28,"0,0013660299643776","0,000226450347640393",28,"22,0565537037814","23,027299220951",
+29,"0,00058","0,000085","0,024785","0,0325","0,000863","0,000143",29,"0,00141557077533757","0,000273869374274922",29,"21,9287712104882","22,9135799779408",
+30,"0,000617","0,000124","0,024785","0,032406","0,000894","0,000202",30,"0,00146901005935203","0,000385480869112649",30,"21,7967769393396","22,7963664036611",
+31,"0,00066","0,000189","0,024785","0,032215","0,000934","0,000297",31,"0,00153292021885197","0,000565130690523684",31,"21,6604674615044","22,6769625950575",
+32,"0,00072","0,000235","0,024785","0,031974","0,000994","0,000357",32,"0,00163133864606544","0,000675010005782509",32,"21,5198744105557","22,5567886323957",
+33,"0,00079","0,000264","0,024785","0,031695","0,001063","0,000386",33,"0,0017461225893248","0,000727918508564697",33,"21,3755401316752","22,4342034895187",
+34,"0,000844","0,000286","0,024785","0,031351","0,001109","0,000404",34,"0,00181981021033204","0,000755872575328076",34,"21,227627777322","22,3078098968089",
+35,"0,000879","0,000312","0,024785","0,030979","0,001112","0,000425",35,"0,00184887920193123","0,000790268837187553",35,"21,075085544272","22,176885192004",
+36,"0,000899","0,000342","0,024785","0,030442","0,001115","0,000449",36,"0,00184465589899665","0,000826854495567889",36,"20,91676153141","22,0413792148063",
+37,"0,000917","0,000375","0,024785","0,029814","0,001118","0,000475",37,"0,00183552802705006","0,000864125511307219",37,"20,7517117601791","21,9011434423119",
+38,"0,000943","0,000414","0,024705","0,029135","0,001121","0,000507",38,"0,00183738984801838","0,000909150797106622",38,"20,5795545798017","21,7559890851966",
+39,"0,000988","0,000466","0,024573","0,028507","0,001145","0,000553",39,"0,00187165940319805","0,000977861098745547",39,"20,4002199199721","21,6058716440318",
+40,"0,00106","0,000541","0,02442","0,027775","0,001198","0,000622",40,"0,0019518329552477","0,00108332931654749",40,"20,2140625570327","21,4510826890808",
+41,"0,001162","0,00064","0,024175","0,02688","0,00128","0,000713",41,"0,00207579177337319","0,00121997808732102",41,"20,0217040811598","21,2921924529418",
+42,"0,001297","0,000731","0,023854","0,025955","0,001394","0,00079",42,"0,00224497841249829","0,00132793244597766",42,"19,8237221637915","21,1296578706543",
+43,"0,001451","0,000816","0,023489","0,024926","0,001521","0,000857",43,"0,00243272243510889","0,00141203379932274",43,"19,6207191412529","20,9626812100139",
+44,"0,001638","0,000907","0,023111","0,023929","0,001676","0,000929",44,"0,00266127940219884","0,00149914683725818",44,"19,4127737972473","20,7905454112415",
+45,"0,001864","0,001018","0,022664","0,023099","0,001864","0,001018",45,"0,00293293819139557","0,00161578340269244",45,"19,2003823311494","20,6130692452564",
+46,"0,002085","0,001142","0,022022","0,022427","0,002039","0,001117",46,"0,00316827366777364","0,00174873752137769",46,"18,9840767481184","20,4306034450201",
+47,"0,002297","0,00123","0,021325","0,021929","0,002201","0,001177",47,"0,00337182426796841","0,00182528505504822",47,"18,7628857749754","20,2432276746093",
+48,"0,002507","0,001283","0,020724","0,021594","0,002356","0,001202",48,"0,0035658227732599","0,00185206102331175",48,"18,5359010068178","20,0495529309189",
+49,"0,002728","0,00132","0,020176","0,021385","0,002516","0,001212",49,"0,00376739861214749","0,00185854093548024",49,"18,3026008781116","19,8482953022641",
+50,"0,002952","0,001369","0,019582","0,021238","0,002677","0,001231",50,"0,00395987677254581","0,00188259387435964",50,"18,0627545095068","19,6387264914598",
+51,"0,003174","0,001437","0,019057","0,021162","0,002831","0,001266",51,"0,00414453509600161","0,00193252146172489",51,"17,8158131144229","19,4208371000777",
+52,"0,003433","0,001536","0,018511","0,021162","0,003016","0,001324",52,"0,00436700541496165","0,0020224054802161",52,"17,5612287679575","19,1947648791626",
+53,"0,003762","0,001662","0,017991","0,021162","0,003258","0,001403",53,"0,00466852292209714","0,00214248355625446",53,"17,2992237223459","18,9609021066594",
+54,"0,004162","0,001804","0,017503","0,021162","0,003555","0,001491",54,"0,00504566131250636","0,00227683978352737",54,"17,0307008887181","18,7194442925047",
+55,"0,004626","0,001953","0,017079","0,021162","0,0039","0,001581",55,"0,00548755369768889","0,00241327959904982",55,"16,7564764291192","18,4702759232396",
+56,"0,005131","0,002108","0,016603","0,021162","0,004274","0,00167",56,"0,00595795661202832","0,00255026590621037",56,"16,4771547578025","18,2130401183235",
+57,"0,005666","0,002276","0,016001","0,021162","0,004676","0,001766",57,"0,00643976083116212","0,00269585529126879",57,"16,1927164501555","17,9473321924542",
+58,"0,006199","0,002456","0,015535","0,021162","0,005065","0,001866",58,"0,00691112884719342","0,00284814529936807",58,"15,9028355657424","17,6728689774973",
+59,"0,00671","0,002633","0,015215","0,021162","0,005422","0,001958",59,"0,00735138661830769","0,00298946930150633",59,"15,6068096608317","17,389311021041",
+60,"0,007196","0,00283","0,014891","0,021162","0,005755","0,00206",60,"0,00775222823386637","0,00314585814068042",60,"15,3035846144115","17,0959914033618",
+61,"0,007709","0,003083","0,014604","0,021103","0,006102","0,002199",61,"0,00817274205555274","0,00335454166611148",61,"14,9919490093792","16,7926583805665",
+62,"0,008288","0,003406","0,014326","0,021026","0,006496","0,002383",62,"0,00865196692715569","0,00362776436900724",62,"14,671533629669","16,4796463762009",
+63,"0,008988","0,003797","0,014117","0,020939","0,006971","0,002605",63,"0,00924538357823671","0,00395938726110384",63,"14,34248568667","16,1574476441063",
+64,"0,009859","0,004285","0,013996","0,020813","0,007557","0,002885",64,"0,00999795671476775","0,00437511826764924",64,"14,0056729326707","15,8264084297965",
+65,"0,010928","0,004884","0,013796","0,020572","0,008293","0,003237",65,"0,010928","0,004884",65,"13,6624969026257","15,4872232001264",
+66,"0,012201","0,005629","0,013556","0,020485","0,009178","0,003661",66,"0,0120367192546405","0,00551486297477926",66,"13,3144976085974","15,1406591072111",
+67,"0,013603","0,006475","0,01337","0,02032","0,010137","0,004141",67,"0,0132440759805995","0,00621713138088734",67,"12,9631108387744","14,7878383738244",
+68,"0,015087","0,007377","0,013252","0,020185","0,011123","0,004637",68,"0,0144989675850117","0,0069435422287239",68,"12,6086248579551","14,4290592659363",
+69,"0,01668","0,008338","0,013139","0,020108","0,012169","0,005146",69,"0,0158260037941827","0,00769361973443606",69,"12,2505907707557","14,0638747447635",
+70,"0,018427","0,009379","0,012995","0,019939","0,013316","0,005698",70,"0,0172677738366052","0,00848905891192019",70,"11,8887660583332","13,6917689987219",
+71,"0,020402","0,010529","0,01274","0,019744","0,014649","0,006302",71,"0,0189005861584697","0,00935274005963214",71,"11,5232984114879","13,3124499303919",
+72,"0,022701","0,011845","0,012501","0,01951","0,016198","0,006994",72,"0,0207989390122639","0,0103329295330916",72,"11,155067665462","12,9258399487002",
+73,"0,025416","0,013407","0,012211","0,019129","0,018056","0,007848",73,"0,0230505791967179","0,0115045770279701",73,"10,7855993961313","12,5323696390107",
+74,"0,028607","0,015298","0,011972","0,018717","0,020216","0,00889",74,"0,0256849044315236","0,0129263659927076",74,"10,4171445883132","12,1332523609576",
+75,"0,032237","0,017511","0,011771","0,018356","0,022646","0,010096",75,"0,0286572040323879","0,0145744392034596",75,"10,0520154274438","11,7302114619246",
+76,"0,036221","0,019995","0,011429","0,017831","0,025415","0,011504",76,"0,0319419457911435","0,0164338173007829",76,"9,69183699474869","11,3244676862057",
+77,"0,04059","0,022809","0,011038","0,017091","0,028511","0,0132",77,"0,0355544644573907","0,0185795812399227",77,"9,33777724924375","10,9168519440014",
+78,"0,045418","0,026061","0,010837","0,016469","0,031762","0,015135",78,"0,0394497417986459","0,0210382654513496",78,"8,99095700031928","10,5087746541808",
+79,"0,050779","0,029844","0,010553","0,015889","0,03547","0,017388",79,"0,0438046897378122","0,0238918599870594",79,"8,65191093269162","10,1016467665178",
+80,"0,056731","0,034237","0,010149","0,015192","0,03977","0,020117",80,"0,048719813653135","0,0272601773089981",80,"8,32255427797195","9,69740159840595",
+81,"0,063285","0,039277","0,009894","0,01458","0,044321","0,023237",81,"0,0540194590399431","0,0311047053703925",81,"8,00548204240008","9,29878416750652",
+82,"0,070401","0,044981","0,009668","0,014057","0,04923","0,02674",82,"0,0597310190541208","0,0354198068209983",82,"7,70174544679531","8,90781035065937",
+83,"0,077983","0,051342","0,009409","0,013501","0,05454","0,030737",83,"0,0658335017710488","0,0402653432773572",83,"7,41257598188097","8,52611615171281",
+84,"0,085906","0,058326","0,009106","0,012897","0,060227","0,035271",84,"0,0722577563251724","0,0456500619026293",84,"7,13906892807637","8,1555466846534",
+85,"0,094041","0,065881","0,008746","0,01231","0,066281","0,040263",85,"0,0789496934129978","0,051503516366903",85,"6,88190252058548","7,79773566798332",
+86,"0,102251","0,073958","0,008414","0,011584","0,072418","0,045997",86,"0,0856900378874272","0,0579878418043423",86,"6,64152498257821","7,45352799582689",
+87,"0,110408","0,082525","0,008073","0,010802","0,078658","0,052428",87,"0,0924415538905945","0,0650695877329059",87,"6,41706448032659","7,12482217694046",
+88,"0,118399","0,091566","0,007669","0,010022","0,085141","0,059507",88,"0,099253112221218","0,0727154605133424",88,"6,20758595073502","6,81314350291808",
+89,"0,126129","0,101059","0,007294","0,009283","0,091502","0,067171",89,"0,10587394546564","0,0808756269358807",89,"6,0126651140809","6,51975632677072",
+90,"0,133522","0,110913","0,006861","0,008602","0,098056","0,075313",90,"0,112476156647504","0,0894514580696682",90,"5,83046617667241","6,24566897372558",
+91,"0,140465","0,12084","0,006489","0,007939","0,104216","0,083869",91,"0,118657874413795","0,0983028831188938",91,"5,66033787302327","5,99143865642697",
+92,"0,147006","0,130591","0,006168","0,00738","0,11001","0,092315",92,"0,124454153396242","0,106998017018969",92,"5,49928483756577","5,75702872450076",
+93,"0,153281","0,139987","0,005861","0,006864","0,115695","0,100693",93,"0,13008197624372","0,11551005254024",93,"5,34438744609346","5,5400883399672",
+94,"0,159565","0,14895","0,005568","0,006391","0,121466","0,1089",94,"0,135772319665001","0,123751024370913",94,"5,19378012703761","5,33832169277503",
+95,"0,165956","0,15752","0,00529","0,005963","0,127386","0,116909",95,"0,141602338079037","0,131717889443996",95,"5,04673876035591","5,1490554465377",
+96,"0,172468","0,165792","0,005031","0,005581","0,133438","0,124725",96,"0,147562337263842","0,139452353455995",96,"4,90286553361751","4,96960332585464",
+97,"0,179078","0,174001","0,004792","0,005245","0,13958","0,132466",97,"0,153619300192885","0,147115949257863",97,"4,76161522701107","4,79739556022099",
+98,"0,185753","0,182224","0,004575","0,004958","0,145758","0,140118",98,"0,159723282601195","0,15472087692868",98,"4,62212788758422","4,63051381860565",
+99,"0,192466","0,190467","0,004382","0,004718","0,151914","0,147629",99,"0,165824751153217","0,162238415054635",99,"4,48306245441253","4,46684919607473",
+100,"0,199193","0,198722","0,004211","0,004526","0,158012","0,154934",100,"0,171895924571257","0,169609182349977",100,"4,34247474687945","4,30375804848208",
+101,"0,208221","0,210417","0,004211","0,004526","0,164479","0,163311",101,"0,178931672599638","0,17877987063822",101,"4,19774982384294","4,13770034228565",
+102,"0,217049","0,221987","0,004211","0,004526","0,170732","0,171514",102,"0,185734109935074","0,187758548631387",102,"4,05040567978824","3,9736098024206",
+103,"0,225635","0,23336","0,004211","0,004526","0,17674","0,179486",103,"0,19227000293219","0,196486617675866",103,"3,89605157932726","3,80743212416273",
+104,"0,233937","0,244465","0,004211","0,004526","0,182474","0,187179",104,"0,198506699133146","0,20490739582255",104,"3,72883717756429","3,63370352424502",
+105,"0,24192","0,255237","0,004211","0,004526","0,187907","0,194544",105,"0,204418035960522","0,212970258666712",105,"3,54087883404321","3,44494672799587",
+106,"0,249548","0,265614","0,004211","0,004526","0,193017","0,20154",106,"0,209977478863123","0,220628022443971",106,"3,32148553743962","3,23081131954188",
+107,"0,256791","0,275543","0,004211","0,004526","0,197785","0,208129",107,"0,215163999230641","0,227841838230782",107,"3,05604573837067","2,97681189359515",
+108,"0,263622","0,284974","0,004211","0,004526","0,202193","0,214281",108,"0,219959460503388","0,234576074792466",108,"2,72450240025862","2,66251717734665",
+109,"0,270017","0,293863","0,004211","0,004526","0,206228","0,219967",109,"0,224348561373084","0,240800712505151",109,"2,29921703483048","2,25890229910401",
+110,"0,275955","0,302175","0,004211","0,004526","0,209878",0.225167,110,"0,228318779682482","0,246493671505013",110,"1,74200117338223","1,72452531586056",
+111,1,1,0,0,1,1,111,1,1,111,1,1,
diff --git a/inst/extdata/Germany_Annuities_DAV1994R_AV.csv b/inst/extdata/Germany_Annuities_DAV1994R_AV.csv
new file mode 100644
index 0000000000000000000000000000000000000000..61c7391cc77eca5286fa9765f554250677271499
--- /dev/null
+++ b/inst/extdata/Germany_Annuities_DAV1994R_AV.csv
@@ -0,0 +1,116 @@
+"        DAV-Sterbetafel 1994 R
+Altersverschiebung, Grundtafel 1955",,
+,,
+,,
+YOB,AS Male,AS Female
+1900,7,6
+1901,7,6
+1902,7,6
+1903,7,5
+1904,7,5
+1905,7,5
+1906,7,5
+1907,6,5
+1908,6,4
+1909,6,4
+1910,6,4
+1911,5,4
+1912,5,4
+1913,5,4
+1914,4,4
+1915,4,4
+1916,4,4
+1917,4,4
+1918,4,4
+1919,4,4
+1920,4,4
+1921,3,4
+1922,3,4
+1923,3,4
+1924,3,4
+1925,3,4
+1926,3,4
+1927,3,4
+1928,3,4
+1929,3,4
+1930,3,4
+1931,3,3
+1932,3,3
+1933,3,3
+1934,3,3
+1935,2,3
+1936,2,3
+1937,2,3
+1938,2,3
+1939,2,2
+1940,2,2
+1941,2,2
+1942,2,2
+1943,2,2
+1944,1,2
+1945,1,2
+1946,1,1
+1947,1,1
+1948,1,1
+1949,1,1
+1950,1,1
+1951,1,1
+1952,0,0
+1953,0,0
+1954,0,0
+1955,0,0
+1956,0,0
+1957,0,0
+1958,0,-1
+1959,-1,-1
+1960,-1,-1
+1961,-1,-1
+1962,-1,-1
+1963,-1,-1
+1964,-1,-2
+1965,-1,-2
+1966,-1,-2
+1967,-2,-2
+1968,-2,-2
+1969,-2,-3
+1970,-2,-3
+1971,-2,-3
+1972,-2,-3
+1973,-2,-3
+1974,-3,-3
+1975,-3,-4
+1976,-3,-4
+1977,-3,-4
+1978,-3,-4
+1979,-3,-5
+1980,-3,-5
+1981,-3,-5
+1982,-4,-5
+1983,-4,-5
+1984,-4,-6
+1985,-4,-6
+1986,-4,-6
+1987,-4,-6
+1988,-4,-7
+1989,-5,-7
+1990,-5,-7
+1991,-5,-7
+1992,-5,-8
+1993,-5,-8
+1994,-5,-8
+1995,-5,-8
+1996,-5,-8
+1997,-6,-9
+1998,-6,-9
+1999,-6,-9
+2000,-6,-9
+2001,-6,-9
+2002,-6,-10
+2003,-6,-10
+2004,-7,-10
+2005,-7,-11
+2006,-7,-11
+2007,-7,-11
+2008,-7,-11
+2009,-7,-11
+2010,-7,-12
diff --git a/inst/extdata/Germany_Annuities_DAV2004R.csv b/inst/extdata/Germany_Annuities_DAV2004R.csv
new file mode 100644
index 0000000000000000000000000000000000000000..55a2c0b41eaf0f49036ec3677dc944f88ce1ec29
--- /dev/null
+++ b/inst/extdata/Germany_Annuities_DAV2004R.csv
@@ -0,0 +1,126 @@
+,Selektionstafel,Selektionstafel,Aggregattafel,Aggregattafel,Selektionstafel,Selektionstafel,Aggregattafel,Aggregattafel,Selektionstafel,Selektionstafel,Aggregattafel,Aggregattafel
+,qx(1999),qx(1999),qx(1999),qx(1999),qx(1999),qx(1999),qx(1999),qx(1999),qx(1999),qx(1999),qx(1999),qx(1999)
+,2. Ordnung,2. Ordnung,2. Ordnung,2. Ordnung,Bestand,Bestand,Bestand,Bestand,1. Ordnung,1. Ordnung,1. Ordnung,1. Ordnung
+Alter,Männer,Frauen,Männer,Frauen,Männer,Frauen,Männer,Frauen,Männer,Frauen,Männer,Frauen
+0,0.003018,0.003053,0.004076,0.003226,0.002829,0.002833,0.003821,0.002993,0.002546,0.002549,0.003439,0.002694
+1,0.000278,0.000317,0.000375,0.000335,0.00026,0.000294,0.000352,0.000311,0.000234,0.000265,0.000317,0.00028
+2,0.000187,0.000182,0.000253,0.000192,0.000176,0.000169,0.000237,0.000178,0.000158,0.000152,0.000214,0.00016
+3,0.000139,0.00014,0.000187,0.000148,0.00013,0.00013,0.000176,0.000137,0.000117,0.000117,0.000158,0.000124
+4,0.000107,0.000114,0.000145,0.00012,0.0001,0.000106,0.000136,0.000112,0.00009,0.000095,0.000122,0.000101
+5,0.000095,0.000089,0.000128,0.000094,0.000089,0.000082,0.00012,0.000087,0.00008,0.000074,0.000108,0.000078
+6,0.00009,0.000091,0.000121,0.000097,0.000084,0.000085,0.000114,0.00009,0.000076,0.000076,0.000102,0.000081
+7,0.000077,0.000091,0.000104,0.000096,0.000072,0.000084,0.000097,0.000089,0.000065,0.000076,0.000087,0.00008
+8,0.000087,0.000078,0.000117,0.000082,0.000081,0.000072,0.00011,0.000076,0.000073,0.000065,0.000099,0.000069
+9,0.000074,0.000077,0.0001,0.000082,0.000069,0.000072,0.000093,0.000076,0.000062,0.000065,0.000084,0.000068
+10,0.000073,0.000075,0.000098,0.000079,0.000068,0.000069,0.000092,0.000073,0.000061,0.000062,0.000083,0.000066
+11,0.000086,0.000081,0.000117,0.000085,0.000081,0.000075,0.000109,0.000079,0.000073,0.000067,0.000098,0.000071
+12,0.000091,0.000085,0.000123,0.00009,0.000085,0.000079,0.000115,0.000083,0.000077,0.000071,0.000104,0.000075
+13,0.0001,0.000089,0.000135,0.000094,0.000094,0.000083,0.000127,0.000088,0.000084,0.000075,0.000114,0.000079
+14,0.000122,0.000104,0.000165,0.00011,0.000115,0.000097,0.000155,0.000102,0.000103,0.000087,0.00014,0.000092
+15,0.000169,0.000136,0.000228,0.000144,0.000158,0.000127,0.000214,0.000134,0.000142,0.000114,0.000192,0.00012
+16,0.000243,0.000164,0.000328,0.000173,0.000227,0.000152,0.000307,0.000161,0.000205,0.000137,0.000276,0.000144
+17,0.00032,0.000188,0.000432,0.000199,0.0003,0.000175,0.000405,0.000185,0.00027,0.000157,0.000364,0.000166
+18,0.000523,0.000267,0.000707,0.000282,0.000491,0.000248,0.000663,0.000262,0.000442,0.000223,0.000596,0.000235
+19,0.000553,0.000269,0.000747,0.000285,0.000518,0.00025,0.0007,0.000264,0.000467,0.000225,0.00063,0.000238
+20,0.00055,0.00026,0.000743,0.000275,0.000516,0.000242,0.000697,0.000255,0.000464,0.000218,0.000627,0.00023
+21,0.000558,0.000239,0.000754,0.000252,0.000523,0.000222,0.000707,0.000234,0.000471,0.000199,0.000636,0.000211
+22,0.000548,0.000243,0.000741,0.000257,0.000514,0.000226,0.000694,0.000238,0.000463,0.000203,0.000625,0.000215
+23,0.000563,0.000227,0.000761,0.00024,0.000528,0.000211,0.000713,0.000223,0.000475,0.00019,0.000642,0.000201
+24,0.000546,0.000251,0.000737,0.000266,0.000512,0.000233,0.000691,0.000246,0.00046,0.00021,0.000622,0.000222
+25,0.000541,0.000255,0.000731,0.00027,0.000508,0.000237,0.000686,0.00025,0.000457,0.000213,0.000617,0.000225
+26,0.00054,0.000255,0.00073,0.00027,0.000506,0.000237,0.000684,0.00025,0.000456,0.000213,0.000616,0.000225
+27,0.000558,0.000266,0.000743,0.000281,0.000523,0.000247,0.000697,0.000261,0.000471,0.000222,0.000627,0.000235
+28,0.000574,0.000293,0.000726,0.000309,0.000538,0.000272,0.000681,0.000287,0.000485,0.000244,0.000613,0.000258
+29,0.000595,0.000317,0.000715,0.000335,0.000557,0.000294,0.00067,0.000311,0.000502,0.000265,0.000603,0.00028
+30,0.00061,0.000329,0.000709,0.000348,0.000572,0.000306,0.000665,0.000323,0.000515,0.000275,0.000598,0.000291
+31,0.000647,0.00035,0.000717,0.000361,0.000606,0.000325,0.000672,0.000335,0.000546,0.000292,0.000605,0.000302
+32,0.000674,0.000394,0.000742,0.000381,0.000632,0.000365,0.000695,0.000353,0.000568,0.000329,0.000626,0.000318
+33,0.000712,0.000427,0.000786,0.000413,0.000668,0.000396,0.000736,0.000383,0.000601,0.000357,0.000663,0.000344
+34,0.000774,0.00048,0.000845,0.000461,0.000726,0.000445,0.000792,0.000427,0.000653,0.000401,0.000713,0.000385
+35,0.000826,0.000533,0.000918,0.000519,0.000774,0.000494,0.000861,0.000482,0.000697,0.000445,0.000775,0.000434
+36,0.00089,0.000596,0.001008,0.000585,0.000834,0.000553,0.000945,0.000543,0.000751,0.000498,0.00085,0.000488
+37,0.000973,0.000671,0.001119,0.000656,0.000912,0.000623,0.001049,0.000608,0.000821,0.000561,0.000944,0.000547
+38,0.001041,0.000725,0.001242,0.000725,0.000976,0.000673,0.001164,0.000672,0.000878,0.000606,0.001047,0.000605
+39,0.001148,0.000785,0.001367,0.000798,0.001076,0.000729,0.001281,0.00074,0.000968,0.000656,0.001153,0.000666
+40,0.001284,0.00089,0.001495,0.000881,0.001204,0.000826,0.001401,0.000817,0.001083,0.000743,0.001261,0.000735
+41,0.001386,0.000986,0.001626,0.000968,0.001299,0.000915,0.001524,0.000899,0.001169,0.000823,0.001372,0.000809
+42,0.001527,0.001082,0.001758,0.001059,0.001431,0.001004,0.001648,0.000983,0.001288,0.000903,0.001483,0.000885
+43,0.001663,0.001198,0.0019,0.001149,0.001559,0.001111,0.001781,0.001066,0.001403,0.001,0.001603,0.000959
+44,0.001815,0.001292,0.002053,0.001237,0.001702,0.001198,0.001924,0.001148,0.001532,0.001079,0.001732,0.001033
+45,0.002038,0.001437,0.002217,0.001332,0.00191,0.001334,0.002079,0.001236,0.001719,0.0012,0.001871,0.001113
+46,0.002219,0.001546,0.0024,0.00144,0.00208,0.001434,0.00225,0.001336,0.001872,0.001291,0.002025,0.001203
+47,0.002458,0.001671,0.002601,0.001558,0.002304,0.00155,0.002438,0.001446,0.002074,0.001395,0.002194,0.001301
+48,0.002688,0.00186,0.002813,0.001683,0.00252,0.001726,0.002637,0.001562,0.002268,0.001553,0.002373,0.001406
+49,0.002994,0.001976,0.003038,0.001811,0.002807,0.001833,0.002848,0.00168,0.002526,0.00165,0.002563,0.001512
+50,0.003364,0.002183,0.003274,0.001935,0.003153,0.002025,0.003069,0.001796,0.002838,0.001823,0.002762,0.001616
+51,0.003591,0.002353,0.003534,0.00206,0.003366,0.002183,0.003312,0.001911,0.003029,0.001965,0.002981,0.00172
+52,0.00398,0.002502,0.003807,0.002182,0.003731,0.002321,0.003568,0.002025,0.003358,0.002089,0.003212,0.001822
+53,0.004366,0.002709,0.004088,0.002312,0.004093,0.002514,0.003832,0.002146,0.003684,0.002262,0.003449,0.001931
+54,0.004805,0.002957,0.004367,0.002458,0.004505,0.002744,0.004093,0.00228,0.004054,0.00247,0.003684,0.002052
+55,0.005238,0.003141,0.004636,0.002618,0.00491,0.002914,0.004346,0.002429,0.004419,0.002623,0.003911,0.002186
+56,0.005775,0.003445,0.004901,0.002803,0.005414,0.003197,0.004594,0.0026,0.004872,0.002877,0.004134,0.00234
+57,0.006387,0.00372,0.005179,0.003013,0.005987,0.003451,0.004855,0.002796,0.005388,0.003106,0.00437,0.002516
+58,0.00698,0.004061,0.005485,0.00324,0.006543,0.003768,0.005142,0.003007,0.005888,0.003391,0.004627,0.002706
+59,0.007753,0.004468,0.005846,0.00349,0.007268,0.004145,0.00548,0.003238,0.006541,0.003731,0.004932,0.002914
+60,0.008565,0.004935,0.006281,0.003766,0.008029,0.004579,0.005888,0.003494,0.007226,0.004121,0.005299,0.003145
+61,0.00939,0.005379,0.006848,0.004074,0.008802,0.004991,0.006419,0.00378,0.007922,0.004492,0.005777,0.003402
+62,0.010182,0.005822,0.007566,0.004421,0.009544,0.005402,0.007092,0.004102,0.00859,0.004862,0.006383,0.003692
+63,0.010939,0.006221,0.008438,0.004815,0.010254,0.005772,0.007909,0.004467,0.009229,0.005195,0.007119,0.004021
+64,0.011774,0.006591,0.009439,0.00525,0.011037,0.006115,0.008848,0.004871,0.009933,0.005504,0.007963,0.004384
+65,0.012699,0.006977,0.010533,0.005783,0.011904,0.006474,0.009873,0.005366,0.010714,0.005827,0.008886,0.00483
+66,0.013823,0.007504,0.011779,0.006321,0.012958,0.006962,0.011042,0.005865,0.011662,0.006266,0.009938,0.005278
+67,0.015212,0.008268,0.013339,0.007071,0.01426,0.007671,0.012504,0.006561,0.012834,0.006904,0.011253,0.005905
+68,0.016712,0.009222,0.015038,0.007992,0.015666,0.008557,0.014097,0.007415,0.014099,0.007701,0.012687,0.006674
+69,0.018321,0.010313,0.016869,0.009039,0.017174,0.009569,0.015813,0.008387,0.015456,0.008612,0.014231,0.007548
+70,0.020056,0.01154,0.018832,0.010209,0.0188,0.010707,0.017653,0.009473,0.01692,0.009637,0.015887,0.008525
+71,0.021984,0.013015,0.020937,0.011591,0.020608,0.012076,0.019626,0.010755,0.018547,0.010869,0.017663,0.009679
+72,0.02419,0.014689,0.02323,0.013131,0.022675,0.013629,0.021775,0.012183,0.020408,0.012266,0.019598,0.010965
+73,0.026683,0.016504,0.025719,0.014778,0.025012,0.015313,0.024109,0.013712,0.022511,0.013782,0.021698,0.012341
+74,0.029483,0.018588,0.028436,0.016656,0.027637,0.017247,0.026656,0.015454,0.024873,0.015522,0.02399,0.013909
+75,0.032731,0.020976,0.031542,0.018808,0.030682,0.019462,0.029567,0.017451,0.027614,0.017516,0.02661,0.015706
+76,0.036376,0.023574,0.035006,0.021163,0.034099,0.021873,0.032815,0.019636,0.030689,0.019686,0.029533,0.017672
+77,0.040539,0.026251,0.038965,0.023618,0.038,0.024357,0.036525,0.021914,0.0342,0.021922,0.032873,0.019722
+78,0.045283,0.029312,0.043496,0.026468,0.042448,0.027197,0.040773,0.024558,0.038203,0.024477,0.036696,0.022102
+79,0.050717,0.032944,0.048724,0.029908,0.047541,0.030567,0.045673,0.02775,0.042787,0.02751,0.041106,0.024975
+80,0.056992,0.037376,0.054808,0.034171,0.053423,0.034679,0.051377,0.031705,0.048081,0.031211,0.046239,0.028535
+81,0.064088,0.042803,0.061748,0.039454,0.060076,0.039715,0.057882,0.036608,0.054068,0.035743,0.052094,0.032947
+82,0.072092,0.049385,0.069628,0.045913,0.067579,0.045822,0.065269,0.0426,0.060821,0.04124,0.058742,0.03834
+83,0.081033,0.057051,0.078479,0.053487,0.075959,0.052935,0.073565,0.049627,0.068363,0.047641,0.066209,0.044665
+84,0.091012,0.065553,0.088405,0.061956,0.085314,0.060823,0.08287,0.057486,0.076782,0.054741,0.074583,0.051737
+85,0.102071,0.074862,0.099447,0.071302,0.095681,0.06946,0.093221,0.066157,0.086113,0.062514,0.083899,0.059541
+86,0.114141,0.085115,0.111543,0.081656,0.106995,0.078974,0.104559,0.075764,0.096295,0.071076,0.094103,0.068187
+87,0.127192,0.096333,0.124661,0.093028,0.119229,0.089382,0.116856,0.086315,0.107306,0.080444,0.105171,0.077684
+88,0.141021,0.108385,0.138599,0.105275,0.132192,0.100565,0.129921,0.097679,0.118973,0.090508,0.116929,0.087911
+89,0.155425,0.121035,0.15315,0.118149,0.145694,0.112302,0.143562,0.109624,0.131124,0.101071,0.129206,0.098662
+90,0.170231,0.133899,0.168138,0.131265,0.159573,0.124237,0.157611,0.121794,0.143616,0.111814,0.14185,0.109614
+91,0.185449,0.14667,0.183559,0.144313,0.173838,0.136087,0.172067,0.1339,0.156454,0.122478,0.15486,0.12051
+92,0.200989,0.159395,0.199321,0.157333,0.188405,0.147894,0.186841,0.145981,0.169564,0.133104,0.168157,0.131383
+93,0.21685,0.172113,0.215417,0.170365,0.203273,0.159695,0.20193,0.158072,0.182946,0.143725,0.181737,0.142265
+94,0.232997,0.18486,0.23181,0.183442,0.218409,0.171521,0.217297,0.170206,0.196568,0.154369,0.195567,0.153185
+95,0.249388,0.197618,0.24846,0.196546,0.233774,0.183359,0.232904,0.182365,0.210397,0.165023,0.209614,0.164128
+96,0.265999,0.210358,0.265339,0.209643,0.249345,0.195179,0.248727,0.194516,0.224411,0.175662,0.223854,0.175065
+97,0.282823,0.223038,0.282439,0.222688,0.265116,0.206945,0.264756,0.20662,0.238604,0.18625,0.23828,0.185958
+98,0.299824,0.235681,0.299718,0.235701,0.281052,0.218676,0.280953,0.218694,0.252947,0.196808,0.252858,0.196824
+99,0.316929,0.248296,0.317104,0.248685,0.297086,0.23038,0.297251,0.230742,0.267377,0.207342,0.267526,0.207667
+100,0.330487,0.275117,0.330487,0.275117,0.309795,0.255266,0.309795,0.255266,0.278816,0.229739,0.278816,0.229739
+101,0.348131,0.291416,0.348131,0.291416,0.326335,0.270389,0.326335,0.270389,0.293701,0.24335,0.293701,0.24335
+102,0.366086,0.308144,0.366086,0.308144,0.343166,0.28591,0.343166,0.28591,0.30885,0.257319,0.30885,0.257319
+103,0.384354,0.325311,0.384354,0.325311,0.36029,0.301838,0.36029,0.301838,0.324261,0.271655,0.324261,0.271655
+104,0.402934,0.34293,0.402934,0.34293,0.377706,0.318186,0.377706,0.318186,0.339936,0.286368,0.339936,0.286368
+105,0.421824,0.361012,0.421824,0.361012,0.395414,0.334963,0.395414,0.334963,0.355873,0.301467,0.355873,0.301467
+106,0.441023,0.379567,0.441023,0.379567,0.413411,0.35218,0.413411,0.35218,0.372069,0.316962,0.372069,0.316962
+107,0.460525,0.398606,0.460525,0.398606,0.431692,0.369844,0.431692,0.369844,0.388523,0.33286,0.388523,0.33286
+108,0.480327,0.418136,0.480327,0.418136,0.450254,0.387966,0.450254,0.387966,0.405229,0.349169,0.405229,0.349169
+109,0.500419,0.438167,0.500419,0.438167,0.469088,0.406552,0.469088,0.406552,0.42218,0.365896,0.42218,0.365896
+110,0.520793,0.458705,0.520793,0.458705,0.488186,0.425607,0.488186,0.425607,0.439368,0.383046,0.439368,0.383046
+111,0.541435,0.479752,0.541435,0.479752,0.507536,0.445136,0.507536,0.445136,0.456782,0.400622,0.456782,0.400622
+112,0.56233,0.501312,0.56233,0.501312,0.527123,0.46514,0.527123,0.46514,0.474411,0.418626,0.474411,0.418626
+113,0.583459,0.523382,0.583459,0.523382,0.54693,0.485617,0.54693,0.485617,0.492237,0.437055,0.492237,0.437055
+114,0.604801,0.545956,0.604801,0.545956,0.566935,0.506563,0.566935,0.506563,0.510241,0.455906,0.510241,0.455906
+115,0.626326,0.569024,0.626326,0.569024,0.587112,0.527966,0.587112,0.527966,0.528401,0.47517,0.528401,0.47517
+116,0.648003,0.59257,0.648003,0.59257,0.607432,0.549813,0.607432,0.549813,0.546689,0.494832,0.546689,0.494832
+117,0.669795,0.616569,0.669795,0.616569,0.62786,0.57208,0.62786,0.57208,0.565074,0.514872,0.565074,0.514872
+118,0.691657,0.640988,0.691657,0.640988,0.648353,0.594737,0.648353,0.594737,0.583517,0.535264,0.583517,0.535264
+119,0.713536,0.665783,0.713536,0.665783,0.668862,0.617744,0.668862,0.617744,0.601976,0.555969,0.601976,0.555969
+120,0.735375,0.690898,0.735375,0.690898,0.689333,0.641046,0.689333,0.641046,0.6204,0.576942,0.6204,0.576942
+121,1,1,1,1,0,0,0,0,1,1,1,1
diff --git a/inst/extdata/Germany_Annuities_DAV2004R_AV.csv b/inst/extdata/Germany_Annuities_DAV2004R_AV.csv
new file mode 100644
index 0000000000000000000000000000000000000000..07f67477cb52edd5a994892320cc409b15a6c225
--- /dev/null
+++ b/inst/extdata/Germany_Annuities_DAV2004R_AV.csv
@@ -0,0 +1,122 @@
+Geburtsjahrgang t,Männer Bestand,Frauen Bestand,Männer B20,Frauen B20,Männer 1. Ordnung,Frauen 1. Ordnung
+1900,12,10,9,8,,
+1901,12,10,9,8,,
+1902,12,10,9,8,,
+1903,11,10,9,8,,
+1904,11,9,9,8,,
+1905,11,9,9,8,,
+1906,10,8,9,8,,
+1907,10,8,9,8,,
+1908,9,7,9,8,,
+1909,8,7,9,8,,
+1910,8,6,9,8,12,11
+1911,7,6,9,8,12,11
+1912,7,6,9,8,12,11
+1913,6,5,9,8,12,11
+1914,5,5,8,7,12,11
+1915,5,5,7,7,12,11
+1916,4,4,7,6,12,11
+1917,4,4,6,6,12,10
+1918,3,4,5,5,11,10
+1919,3,4,5,5,10,9
+1920,3,3,5,5,9,8
+1921,3,3,4,4,8,8
+1922,3,3,4,4,7,7
+1923,2,3,4,4,7,7
+1924,2,3,4,4,7,7
+1925,2,3,4,4,7,6
+1926,2,3,4,4,6,6
+1927,2,3,4,4,6,6
+1928,2,3,4,4,6,6
+1929,2,3,4,4,6,6
+1930,2,2,4,4,6,6
+1931,2,2,3,3,6,6
+1932,2,2,3,3,6,6
+1933,2,2,3,3,6,6
+1934,2,2,3,3,6,5
+1935,2,2,3,3,5,5
+1936,2,2,3,3,5,5
+1937,2,2,3,3,5,5
+1938,2,2,3,2,5,5
+1939,2,2,3,2,5,5
+1940,1,1,2,2,5,4
+1941,1,1,2,2,5,4
+1942,1,1,2,2,4,4
+1943,1,1,2,2,4,4
+1944,1,1,2,1,4,4
+1945,1,1,2,1,4,4
+1946,1,1,1,1,4,3
+1947,1,1,1,1,4,3
+1948,0,0,1,1,3,3
+1949,0,0,1,1,3,3
+1950,0,0,1,0,3,3
+1951,0,0,0,0,3,2
+1952,0,0,0,0,3,2
+1953,0,0,0,0,2,2
+1954,0,0,0,0,2,2
+1955,0,0,0,0,2,2
+1956,-1,-1,-1,-1,2,1
+1957,-1,-1,-1,-1,1,1
+1958,-1,-1,-1,-1,1,1
+1959,-1,-1,-1,-1,1,1
+1960,-1,-1,-2,-1,1,1
+1961,-1,-1,-2,-2,0,0
+1962,-2,-2,-2,-2,0,0
+1963,-2,-2,-2,-2,0,0
+1964,-2,-2,-2,-2,0,0
+1965,-2,-2,-3,-2,0,0
+1966,-2,-2,-3,-3,-1,-1
+1967,-2,-2,-3,-3,-1,-1
+1968,-3,-3,-3,-3,-1,-1
+1969,-3,-3,-4,-3,-1,-1
+1970,-3,-3,-4,-3,-2,-2
+1971,-3,-3,-4,-4,-2,-2
+1972,-3,-3,-4,-4,-2,-2
+1973,-3,-3,-5,-4,-2,-2
+1974,-4,-3,-5,-4,-3,-2
+1975,-4,-4,-5,-4,-3,-3
+1976,-4,-4,-5,-5,-3,-3
+1977,-4,-4,-6,-5,-3,-3
+1978,-4,-4,-6,-5,-4,-3
+1979,-4,-4,-6,-5,-4,-3
+1980,-5,-4,-6,-5,-4,-4
+1981,-5,-4,-6,-6,-4,-4
+1982,-5,-5,-7,-6,-5,-4
+1983,-5,-5,-7,-6,-5,-4
+1984,-5,-5,-7,-6,-5,-4
+1985,-5,-5,-7,-6,-5,-5
+1986,-5,-5,-7,-6,-6,-5
+1987,-5,-5,-7,-7,-6,-5
+1988,-5,-5,-8,-7,-6,-5
+1989,-6,-6,-8,-7,-6,-5
+1990,-6,-6,-8,-7,-7,-6
+1991,-6,-6,-8,-7,-7,-6
+1992,-6,-6,-8,-8,-7,-6
+1993,-6,-6,-9,-8,-7,-6
+1994,-6,-6,-9,-8,-7,-7
+1995,-7,-6,-9,-8,-8,-7
+1996,-7,-7,-9,-8,-8,-7
+1997,-7,-7,-10,-9,-8,-7
+1998,-7,-7,-10,-9,-8,-7
+1999,-7,-7,-10,-9,-9,-8
+2000,-7,-7,-10,-9,-9,-8
+2001,-8,-7,-11,-9,-9,-8
+2002,-8,-7,-11,-9,-9,-8
+2003,-8,-8,-11,-10,-10,-8
+2004,-8,-8,-11,-10,-10,-8
+2005,-8,-8,-11,-10,-10,-9
+2006,-8,-8,-11,-10,-10,-9
+2007,-8,-8,-11,-10,-10,-9
+2008,-8,-8,-11,-10,-11,-9
+2009,-8,-8,-11,-10,-11,-9
+2010,-8,-8,-12,-10,-11,-10
+2011,-8,-8,-12,-10,-11,-10
+2012,-8,-8,-12,-10,-12,-10
+2013,-8,-8,-12,-11,-12,-10
+2014,-8,-8,-13,-11,-12,-10
+2015,-8,-8,-13,-11,-12,-11
+2016,-8,-8,-13,-11,-12,-11
+2017,-8,-8,-13,-11,-13,-11
+2018,-8,-8,-13,-11,-13,-11
+2019,-8,-8,-13,-12,-13,-11
+2020,-8,-8,-13,-12,-13,-12
diff --git a/inst/extdata/Germany_Annuities_DAV2004R_AVBase.csv b/inst/extdata/Germany_Annuities_DAV2004R_AVBase.csv
new file mode 100644
index 0000000000000000000000000000000000000000..3c88868672d8fcb0cda9c0af921b49cac8fef3ca
--- /dev/null
+++ b/inst/extdata/Germany_Annuities_DAV2004R_AVBase.csv
@@ -0,0 +1,125 @@
+,Grundtafel,Grundtafel,Grundtafel,Grundtafel,Grundtafel,Grundtafel
+,Bestand,Bestand,B20,B20,1. Ordnung,1. Ordnung
+Alter,Männer,Frauen,Männer,Frauen,Männer,Frauen
+0,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+1,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+2,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+3,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+4,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+5,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+6,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+7,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+8,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+9,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+10,0.000092,0.000073,0.000092,0.000073,0.000083,0.000066
+11,0.000109,0.000079,0.000109,0.000079,0.000098,0.000071
+12,0.000115,0.000083,0.000115,0.000083,0.000104,0.000075
+13,0.000127,0.000088,0.000127,0.000088,0.000114,0.000079
+14,0.000155,0.000102,0.000155,0.000102,0.00014,0.000092
+15,0.000214,0.000134,0.000214,0.000134,0.000192,0.00012
+16,0.000307,0.000161,0.000307,0.000161,0.000276,0.000144
+17,0.000405,0.000185,0.000405,0.000185,0.000364,0.000166
+18,0.000663,0.000223,0.000663,0.000223,0.000596,0.000201
+19,0.000665,0.000223,0.000665,0.000223,0.000598,0.000201
+20,0.000665,0.000223,0.000665,0.000223,0.000598,0.000201
+21,0.000665,0.000223,0.000665,0.000223,0.000598,0.000201
+22,0.000665,0.000223,0.000665,0.000223,0.000598,0.000201
+23,0.000665,0.000223,0.000665,0.000223,0.000598,0.000201
+24,0.000665,0.000246,0.000665,0.000246,0.000598,0.000222
+25,0.000665,0.00025,0.000665,0.00025,0.000598,0.000225
+26,0.000665,0.00025,0.000665,0.00025,0.000598,0.000225
+27,0.000665,0.000261,0.000665,0.000261,0.000598,0.000235
+28,0.000665,0.000287,0.000665,0.000287,0.000598,0.000258
+29,0.000665,0.000311,0.000665,0.000311,0.000598,0.00028
+30,0.000665,0.000323,0.000665,0.000323,0.000598,0.000291
+31,0.000672,0.000335,0.000672,0.000335,0.000605,0.000302
+32,0.000695,0.000353,0.000695,0.000353,0.000626,0.000318
+33,0.000736,0.000383,0.000736,0.000383,0.000663,0.000344
+34,0.000792,0.000427,0.000792,0.000427,0.000713,0.000385
+35,0.000861,0.000482,0.000861,0.000482,0.000754,0.000423
+36,0.000945,0.000543,0.000945,0.000543,0.000805,0.000464
+37,0.001049,0.000608,0.001049,0.000608,0.000871,0.000508
+38,0.001164,0.000672,0.001164,0.000672,0.00094,0.00055
+39,0.001281,0.00074,0.001281,0.00074,0.001008,0.000593
+40,0.001401,0.000817,0.001401,0.000817,0.001073,0.000642
+41,0.001524,0.000899,0.001524,0.000899,0.001137,0.000693
+42,0.001648,0.000983,0.001648,0.000983,0.001197,0.000743
+43,0.001781,0.001066,0.001781,0.001066,0.001259,0.000788
+44,0.001924,0.001148,0.001924,0.001148,0.001325,0.00083
+45,0.002029,0.001212,0.002029,0.001212,0.001395,0.000874
+46,0.002144,0.001284,0.002144,0.001284,0.001473,0.000921
+47,0.002268,0.001361,0.002268,0.001361,0.001557,0.000971
+48,0.002397,0.001439,0.002397,0.001439,0.001644,0.001022
+49,0.002529,0.001514,0.002529,0.001514,0.001735,0.001069
+50,0.002664,0.001582,0.002664,0.001582,0.001826,0.001111
+51,0.002815,0.001647,0.00281,0.001645,0.001924,0.001149
+52,0.002974,0.001708,0.00296,0.001702,0.002023,0.001182
+53,0.003138,0.001773,0.003108,0.001761,0.002121,0.001218
+54,0.003299,0.001848,0.003246,0.001827,0.002212,0.001259
+55,0.003453,0.001934,0.003371,0.001902,0.002294,0.001306
+56,0.003601,0.002035,0.003487,0.00199,0.00237,0.001363
+57,0.003755,0.002153,0.003608,0.002094,0.002451,0.00143
+58,0.003925,0.002279,0.003742,0.002204,0.00254,0.001504
+59,0.004129,0.002417,0.003906,0.002326,0.002649,0.001585
+60,0.004376,0.002569,0.004108,0.002459,0.002781,0.001674
+61,0.004701,0.002737,0.004379,0.002606,0.002957,0.001771
+62,0.005109,0.002921,0.00472,0.002766,0.003176,0.001876
+63,0.005594,0.003123,0.005123,0.00294,0.003432,0.001986
+64,0.006131,0.003334,0.005565,0.003119,0.003707,0.002096
+65,0.006688,0.003589,0.006014,0.003335,0.00398,0.002229
+66,0.007301,0.003828,0.0065,0.003532,0.00427,0.002345
+67,0.008059,0.004173,0.007102,0.003822,0.004631,0.00252
+68,0.00885,0.004591,0.007717,0.004172,0.004995,0.002732
+69,0.009671,0.005049,0.008344,0.004552,0.005363,0.002959
+70,0.01053,0.005543,0.008991,0.004956,0.005744,0.003199
+71,0.011444,0.006118,0.009674,0.005425,0.00615,0.003478
+72,0.012448,0.006744,0.010424,0.00593,0.006605,0.00378
+73,0.013562,0.007394,0.011261,0.00645,0.007122,0.00409
+74,0.014817,0.008134,0.01221,0.007042,0.007722,0.004446
+75,0.016312,0.008988,0.013354,0.007727,0.00846,0.004864
+76,0.018046,0.009927,0.014694,0.008481,0.009337,0.005328
+77,0.020106,0.010914,0.0163,0.009274,0.010403,0.005823
+78,0.022552,0.012095,0.018223,0.010231,0.011693,0.006429
+79,0.025474,0.013569,0.020535,0.011439,0.013259,0.007203
+80,0.028982,0.01546,0.023329,0.013002,0.015167,0.008215
+81,0.033119,0.017884,0.026642,0.015024,0.01745,0.009536
+82,0.03797,0.020946,0.030547,0.017599,0.020162,0.011237
+83,0.043567,0.024667,0.035069,0.020754,0.023324,0.013343
+84,0.049975,0.028996,0.040256,0.024456,0.02697,0.015844
+85,0.057258,0.033986,0.046164,0.028766,0.031142,0.018792
+86,0.065421,0.039756,0.052801,0.033797,0.035854,0.022273
+87,0.074528,0.046377,0.06023,0.039628,0.041159,0.026353
+88,0.084578,0.053839,0.068472,0.046269,0.04709,0.031049
+89,0.095548,0.062095,0.077529,0.053701,0.053666,0.036366
+90,0.105787,0.070867,0.087145,0.061676,0.060681,0.042123
+91,0.115238,0.079822,0.097058,0.069869,0.067908,0.048071
+92,0.124748,0.088901,0.107098,0.07821,0.075209,0.054145
+93,0.134291,0.098033,0.117125,0.086615,0.082462,0.060268
+94,0.143813,0.107136,0.126959,0.094985,0.089515,0.066351
+95,0.153263,0.116083,0.136406,0.103179,0.096209,0.072275
+96,0.162599,0.124729,0.145265,0.111033,0.102378,0.077904
+97,0.171791,0.132917,0.153355,0.118374,0.107876,0.083095
+98,0.180888,0.14052,0.161069,0.125055,0.113045,0.087727
+99,0.189898,0.147409,0.168666,0.130927,0.118108,0.091681
+100,0.196377,0.161812,0.173981,0.143358,0.121553,0.100158
+101,0.205259,0.17007,0.181392,0.150295,0.126442,0.104765
+102,0.214172,0.178439,0.188792,0.157293,0.131302,0.109394
+103,0.223117,0.186919,0.196181,0.164354,0.13613,0.114045
+104,0.23209,0.195516,0.203556,0.171479,0.140927,0.118719
+105,0.241088,0.20423,0.210915,0.178671,0.14569,0.123417
+106,0.250107,0.213063,0.218255,0.185929,0.150416,0.128138
+107,0.259143,0.222016,0.22557,0.193253,0.155105,0.132883
+108,0.268191,0.231089,0.232858,0.200644,0.159752,0.137652
+109,0.277244,0.240283,0.240111,0.208101,0.164354,0.142443
+110,0.286295,0.249596,0.247326,0.215622,0.168907,0.147255
+111,0.295336,0.259025,0.254493,0.223204,0.173407,0.152087
+112,0.304356,0.268568,0.261605,0.230844,0.177848,0.156935
+113,0.313345,0.278218,0.268653,0.238536,0.182224,0.161796
+114,0.322289,0.287969,0.275625,0.246274,0.186528,0.166665
+115,0.331173,0.29781,0.282509,0.254049,0.190752,0.171536
+116,0.339979,0.30773,0.289291,0.26185,0.194887,0.176401
+117,0.348689,0.317711,0.295955,0.269662,0.198923,0.18125
+118,0.35728,0.327734,0.302482,0.277468,0.202848,0.186074
+119,0.365725,0.337774,0.308852,0.285248,0.206649,0.190855
+120,0.373997,0.347799,0.315042,0.292973,0.210311,0.195579
+121,1,1,1,1,1,1
diff --git a/inst/extdata/Germany_Annuities_DAV2004R_Select.csv b/inst/extdata/Germany_Annuities_DAV2004R_Select.csv
new file mode 100644
index 0000000000000000000000000000000000000000..ef70482a41cdf76c387106755bec82b59e2e9a6e
--- /dev/null
+++ b/inst/extdata/Germany_Annuities_DAV2004R_Select.csv
@@ -0,0 +1,7 @@
+Faktoren für Selektionstafel,,
+,Männer,Frauen
+1,0.670538,0.712823
+2,0.876209,0.79823
+3,0.876209,0.79823
+4,0.876209,0.79823
+5,0.876209,0.79823
diff --git a/inst/extdata/Germany_Endowments_DAV1994T.csv b/inst/extdata/Germany_Endowments_DAV1994T.csv
index 423496215b1720c7c97feded6ca16304a5fa961c..fdf5a3f975a586507d0c6584e29562c5f94e7c22 100644
--- a/inst/extdata/Germany_Endowments_DAV1994T.csv
+++ b/inst/extdata/Germany_Endowments_DAV1994T.csv
@@ -1,103 +1,103 @@
 DAV 1994T Männer,,,,,,DAV 1994T Frauen,,,,,
 Alter,t_x,L_x^M,q_x,q_x^a,qbar_x^a,Alter,t_y,L_y^M,q_y,q_y^a,qbar_y^a
-0,29,3119,"0,009253","0,009739","0,011687",0,19,2739,"0,007016","0,007503","0,009003"
-1,2,3156,"0,000705","0,00084","0,001008",1,2,2769,"0,000582","0,000722","0,000867"
-2,1,3103,"0,000493","0,000606","0,000728",2,1,2722,"0,000402","0,00052","0,000624"
-3,1,3092,"0,000355","0,000452","0,000542",3,1,2710,"0,000273","0,00037","0,000444"
-4,1,3153,"0,000306","0,000394","0,000473",4,1,2762,"0,000204","0,000287","0,000345"
-5,1,3185,"0,000291","0,000377","0,000452",5,1,2794,"0,000179","0,000256","0,000307"
-6,1,3162,"0,000276","0,000361","0,000433",6,1,2777,"0,000169","0,000244","0,000293"
-7,1,3075,"0,000258","0,00034","0,000408",7,0,2704,"0,000161","0,000235","0,000283"
-8,1,2999,"0,000236","0,000316","0,000379",8,0,2630,"0,000155","0,000229","0,000275"
-9,1,2999,"0,000217","0,000293","0,000352",9,0,2628,"0,00015","0,000223","0,000268"
-10,1,3015,"0,000205","0,000279","0,000334",10,0,2642,"0,000146","0,000217","0,000261"
-11,1,3041,"0,000202","0,000276","0,000331",11,0,2665,"0,000145","0,000217","0,00026"
-12,1,3097,"0,000209","0,000283","0,00034",12,0,2724,"0,000151","0,000222","0,000267"
-13,1,3215,"0,000233","0,000309","0,000371",13,0,2826,"0,000161","0,000234","0,000281"
-14,1,3471,"0,000293","0,000376","0,000451",14,1,3048,"0,000181","0,000256","0,000307"
-15,2,3832,"0,000402","0,000494","0,000593",15,1,3359,"0,000216","0,000294","0,000353"
-16,2,4210,"0,000556","0,00066","0,000792",16,1,3693,"0,000265","0,000346","0,000416"
-17,3,4582,"0,000751","0,000866","0,00104",17,1,4022,"0,000314","0,0004","0,00048"
-18,5,4957,"0,000956","0,001081","0,001298",18,2,4357,"0,00036","0,000448","0,000537"
-19,6,5250,"0,001069","0,001197","0,001437",19,2,4639,"0,000379","0,000467","0,00056"
-20,6,5424,"0,001102","0,00123","0,001476",20,2,4786,"0,00038","0,000466","0,00056"
-21,6,5552,"0,001091","0,001217","0,001476",21,2,4885,"0,000376","0,000461","0,00056"
-22,6,5641,"0,001065","0,001189","0,001476",22,2,4946,"0,000374","0,000457","0,00056"
-23,6,5651,"0,001038","0,00116","0,001476",23,2,4943,"0,000375","0,000459","0,00056"
-24,6,5576,"0,001016","0,001138","0,001476",24,2,4890,"0,00038","0,000465","0,00056"
-25,5,5444,"0,001003","0,001125","0,001476",25,2,4786,"0,000388","0,000475","0,00056"
-26,5,5306,"0,001001","0,001125","0,001476",26,2,4677,"0,000401","0,000491","0,00056"
-27,5,5173,"0,001013","0,001139","0,001476",27,2,4551,"0,000421","0,000514","0,000581"
-28,5,5023,"0,001038","0,001168","0,001476",28,2,4216,"0,000447","0,000546","0,000612"
-29,5,4894,"0,001076","0,00121","0,001476",29,2,4287,"0,000479","0,000581","0,000645"
-30,5,4735,"0,001122","0,00126","0,001476",30,2,4162,"0,000518","0,000626","0,000689"
-31,5,4610,"0,001172","0,001316","0,001476",31,2,4078,"0,000561","0,000674","0,000735"
-32,6,4471,"0,00123","0,001379","0,001489",32,3,3998,"0,000606","0,000725","0,000783"
-33,6,4378,"0,001295","0,00145","0,001551",33,3,3954,"0,000654","0,000779","0,000833"
-34,6,4347,"0,001373","0,001533","0,001641",34,3,3947,"0,000709","0,000838","0,000897"
-35,6,4358,"0,001467","0,001632","0,001747",35,3,3952,"0,000773","0,000908","0,000971"
-36,7,4414,"0,001576","0,001746","0,001869",36,3,3979,"0,000847","0,000988","0,001057"
-37,8,4455,"0,0017","0,001876","0,002007",37,4,3980,"0,000932","0,00108","0,001156"
-38,8,4396,"0,001841","0,002025","0,002167",38,4,3885,"0,001027","0,001184","0,001267"
-39,9,4171,"0,002003","0,0022","0,002354",39,4,3673,"0,00113","0,001299","0,00139"
-40,8,3951,"0,002189","0,002401","0,002569",40,4,3462,"0,001241","0,001424","0,001524"
-41,9,3579,"0,002405","0,002638","0,002823",41,4,3141,"0,001362","0,001563","0,001672"
-42,10,3890,"0,00265","0,002885","0,003087",42,5,3413,"0,001492","0,001693","0,001812"
-43,12,4160,"0,002928","0,003166","0,003387",43,6,3626,"0,001631","0,001836","0,001964"
-44,14,4442,"0,003239","0,003482","0,003726",44,7,3855,"0,00178","0,001987","0,002126"
-45,17,4866,"0,003588","0,003832","0,0041",45,8,4225,"0,001938","0,002145","0,002295"
-46,21,5085,"0,003975","0,004226","0,004522",46,10,4421,"0,002107","0,002318","0,00248"
-47,24,5417,"0,004401","0,004657","0,004983",47,10,4739,"0,002289","0,002501","0,002676"
-48,26,5227,"0,004873","0,005147","0,005508",48,12,4579,"0,002488","0,002712","0,002902"
-49,26,4989,"0,005401","0,005696","0,006094",49,12,4386,"0,002706","0,002945","0,003151"
-50,29,4794,"0,005993","0,006309","0,006751",50,13,4233,"0,002946","0,003201","0,003425"
-51,31,4608,"0,006655","0,006995","0,007485",51,13,4087,"0,003213","0,003484","0,003728"
-52,32,4372,"0,007391","0,007759","0,008302",52,13,3892,"0,003511","0,0038","0,004066"
-53,33,3903,"0,008202","0,008612","0,009215",53,14,3494,"0,00384","0,004159","0,00445"
-54,33,3647,"0,009082","0,009528","0,010195",54,14,3295,"0,0042","0,004544","0,004862"
-55,36,3591,"0,010029","0,010501","0,011236",55,15,3280,"0,004595","0,004956","0,005303"
-56,41,3683,"0,011044","0,011532","0,01234",56,17,3402,"0,005029","0,005399","0,005777"
-57,46,3737,"0,012127","0,012635","0,013519",57,19,3474,"0,005507","0,00589","0,006302"
-58,49,3691,"0,013283","0,013817","0,014784",58,21,3505,"0,006035","0,006434","0,006884"
-59,51,3508,"0,014521","0,015094","0,01615",59,23,3499,"0,00662","0,007038","0,00753"
-60,53,3282,"0,015854","0,016472","0,017625",60,26,3556,"0,007266","0,007701","0,00824"
-61,53,3040,"0,017296","0,017965","0,019223",61,29,3614,"0,00798","0,008432","0,009022"
-62,54,2819,"0,01886","0,019585","0,020956",62,32,3661,"0,008768","0,009238","0,009884"
-63,56,2664,"0,020561","0,021339","0,022833",63,35,3662,"0,009638","0,01013","0,010839"
-64,60,2637,"0,022416","0,023232","0,024858",64,40,3747,"0,010602","0,011112","0,011889"
-65,66,2659,"0,024455","0,025302","0,027073",65,46,3863,"0,011674","0,0122","0,013054"
-66,72,2518,"0,02671","0,027618","0,029552",66,51,3742,"0,01287","0,013431","0,014371"
-67,66,2240,"0,029228","0,030234","0,03235",67,49,3392,"0,014217","0,014836","0,015874"
-68,57,1596,"0,032057","0,033301","0,035632",68,43,2455,"0,015747","0,016511","0,017667"
-69,48,1342,"0,035238","0,036658","0,039224",69,37,2081,"0,017497","0,018371","0,019657"
-70,52,1328,"0,038812","0,040306","0,043127",70,41,2093,"0,019512","0,020431","0,021861"
-71,68,1481,"0,04282","0,044299","0,0474",71,55,2395,"0,021845","0,022752","0,024344"
-72,86,1807,"0,047297","0,048701","0,05211",72,73,2991,"0,024553","0,025412","0,027191"
-73,104,1896,"0,052277","0,053712","0,057472",73,90,3183,"0,027694","0,028576","0,030576"
-74,111,1886,"0,057783","0,05929","0,06344",74,103,3219,"0,031317","0,032247","0,034504"
-75,117,1768,"0,06383","0,065457","0,070039",75,111,3090,"0,035469","0,036477","0,03903"
-76,120,1641,"0,070429","0,072194","0,077248",76,121,2955,"0,040201","0,041294","0,044184"
-77,123,1519,"0,077593","0,079508","0,085073",77,131,2824,"0,045557","0,046742","0,050014"
-78,125,1400,"0,085336","0,087415","0,093534",78,141,2677,"0,051584","0,052873","0,056574"
-79,125,1270,"0,093674","0,095945","0,102662",79,148,2486,"0,058324","0,059739","0,063921"
-80,122,1134,"0,102621","0,105119","0,112477",80,154,2260,"0,065817","0,067384","0,072101"
-81,120,998,"0,112187","0,114948","0,122995",81,157,2018,"0,074094","0,075842","0,081151"
-82,114,866,"0,12238","0,125449","0,134231",82,155,1789,"0,083184","0,085137","0,091096"
-83,106,736,"0,133205","0,136647","0,146212",83,153,1575,"0,093114","0,095299","0,10197"
-84,95,613,"0,14467","0,148564","0,158964",84,151,1378,"0,103908","0,105353","0,113798"
-85,84,500,"0,156782","0,161226","0,172512",85,145,1178,"0,115582","0,118344","0,126628"
-86,74,397,"0,169544","0,174669","0,186896",86,135,987,"0,128145","0,131289","0,140479"
-87,61,305,"0,182952","0,188958","0,202185",87,124,806,"0,141599","0,145214","0,155379"
-88,50,227,"0,196995","0,204124","0,218413",88,111,648,"0,155939","0,160117","0,171325"
-89,38,167,"0,211661","0,220184","0,235597",89,97,514,"0,171147","0,175998","0,188318"
-90,31,122,"0,226931","0,237094","0,253691",90,84,399,"0,1872","0,192874","0,206375"
-91,24,87,"0,242777","0,255039","0,272891",91,68,300,"0,204065","0,210801","0,225558"
-92,18,62,"0,259168","0,273965","0,293142",92,54,221,"0,221699","0,229756","0,245839"
-93,14,43,"0,276066","0,294055","0,314638",93,43,158,"0,240046","0,249785","0,26727"
-94,10,29,"0,293425","0,315644","0,337739",94,32,109,"0,259042","0,271013","0,289983"
-95,7,20,"0,311199","0,338374","0,36206",95,24,73,"0,27861","0,293464","0,314007"
-96,5,13,"0,329335","0,363301","0,388732",96,16,45,"0,298664","0,317868","0,340119"
-97,3,8,"0,347778","0,391744","0,419166",97,11,29,"0,31911","0,343353","0,367388"
-98,2,5,"0,366467","0,422438","0,452008",98,7,18,"0,339848","0,371053","0,397027"
-99,2,3,"0,385341","0,454579","0,4864",99,5,11,"0,360773","0,400699","0,428748"
-100,1,2,"0,404335","0,492651","0,527137",100,3,7,"0,381775","0,432679","0,462967"
+0,29,3119,0.009253,0.009739,0.011687,0,19,2739,0.007016,0.007503,0.009003
+1,2,3156,0.000705,0.00084,0.001008,1,2,2769,0.000582,0.000722,0.000867
+2,1,3103,0.000493,0.000606,0.000728,2,1,2722,0.000402,0.00052,0.000624
+3,1,3092,0.000355,0.000452,0.000542,3,1,2710,0.000273,0.00037,0.000444
+4,1,3153,0.000306,0.000394,0.000473,4,1,2762,0.000204,0.000287,0.000345
+5,1,3185,0.000291,0.000377,0.000452,5,1,2794,0.000179,0.000256,0.000307
+6,1,3162,0.000276,0.000361,0.000433,6,1,2777,0.000169,0.000244,0.000293
+7,1,3075,0.000258,0.00034,0.000408,7,0,2704,0.000161,0.000235,0.000283
+8,1,2999,0.000236,0.000316,0.000379,8,0,2630,0.000155,0.000229,0.000275
+9,1,2999,0.000217,0.000293,0.000352,9,0,2628,0.00015,0.000223,0.000268
+10,1,3015,0.000205,0.000279,0.000334,10,0,2642,0.000146,0.000217,0.000261
+11,1,3041,0.000202,0.000276,0.000331,11,0,2665,0.000145,0.000217,0.00026
+12,1,3097,0.000209,0.000283,0.00034,12,0,2724,0.000151,0.000222,0.000267
+13,1,3215,0.000233,0.000309,0.000371,13,0,2826,0.000161,0.000234,0.000281
+14,1,3471,0.000293,0.000376,0.000451,14,1,3048,0.000181,0.000256,0.000307
+15,2,3832,0.000402,0.000494,0.000593,15,1,3359,0.000216,0.000294,0.000353
+16,2,4210,0.000556,0.00066,0.000792,16,1,3693,0.000265,0.000346,0.000416
+17,3,4582,0.000751,0.000866,0.00104,17,1,4022,0.000314,0.0004,0.00048
+18,5,4957,0.000956,0.001081,0.001298,18,2,4357,0.00036,0.000448,0.000537
+19,6,5250,0.001069,0.001197,0.001437,19,2,4639,0.000379,0.000467,0.00056
+20,6,5424,0.001102,0.00123,0.001476,20,2,4786,0.00038,0.000466,0.00056
+21,6,5552,0.001091,0.001217,0.001476,21,2,4885,0.000376,0.000461,0.00056
+22,6,5641,0.001065,0.001189,0.001476,22,2,4946,0.000374,0.000457,0.00056
+23,6,5651,0.001038,0.00116,0.001476,23,2,4943,0.000375,0.000459,0.00056
+24,6,5576,0.001016,0.001138,0.001476,24,2,4890,0.00038,0.000465,0.00056
+25,5,5444,0.001003,0.001125,0.001476,25,2,4786,0.000388,0.000475,0.00056
+26,5,5306,0.001001,0.001125,0.001476,26,2,4677,0.000401,0.000491,0.00056
+27,5,5173,0.001013,0.001139,0.001476,27,2,4551,0.000421,0.000514,0.000581
+28,5,5023,0.001038,0.001168,0.001476,28,2,4216,0.000447,0.000546,0.000612
+29,5,4894,0.001076,0.00121,0.001476,29,2,4287,0.000479,0.000581,0.000645
+30,5,4735,0.001122,0.00126,0.001476,30,2,4162,0.000518,0.000626,0.000689
+31,5,4610,0.001172,0.001316,0.001476,31,2,4078,0.000561,0.000674,0.000735
+32,6,4471,0.00123,0.001379,0.001489,32,3,3998,0.000606,0.000725,0.000783
+33,6,4378,0.001295,0.00145,0.001551,33,3,3954,0.000654,0.000779,0.000833
+34,6,4347,0.001373,0.001533,0.001641,34,3,3947,0.000709,0.000838,0.000897
+35,6,4358,0.001467,0.001632,0.001747,35,3,3952,0.000773,0.000908,0.000971
+36,7,4414,0.001576,0.001746,0.001869,36,3,3979,0.000847,0.000988,0.001057
+37,8,4455,0.0017,0.001876,0.002007,37,4,3980,0.000932,0.00108,0.001156
+38,8,4396,0.001841,0.002025,0.002167,38,4,3885,0.001027,0.001184,0.001267
+39,9,4171,0.002003,0.0022,0.002354,39,4,3673,0.00113,0.001299,0.00139
+40,8,3951,0.002189,0.002401,0.002569,40,4,3462,0.001241,0.001424,0.001524
+41,9,3579,0.002405,0.002638,0.002823,41,4,3141,0.001362,0.001563,0.001672
+42,10,3890,0.00265,0.002885,0.003087,42,5,3413,0.001492,0.001693,0.001812
+43,12,4160,0.002928,0.003166,0.003387,43,6,3626,0.001631,0.001836,0.001964
+44,14,4442,0.003239,0.003482,0.003726,44,7,3855,0.00178,0.001987,0.002126
+45,17,4866,0.003588,0.003832,0.0041,45,8,4225,0.001938,0.002145,0.002295
+46,21,5085,0.003975,0.004226,0.004522,46,10,4421,0.002107,0.002318,0.00248
+47,24,5417,0.004401,0.004657,0.004983,47,10,4739,0.002289,0.002501,0.002676
+48,26,5227,0.004873,0.005147,0.005508,48,12,4579,0.002488,0.002712,0.002902
+49,26,4989,0.005401,0.005696,0.006094,49,12,4386,0.002706,0.002945,0.003151
+50,29,4794,0.005993,0.006309,0.006751,50,13,4233,0.002946,0.003201,0.003425
+51,31,4608,0.006655,0.006995,0.007485,51,13,4087,0.003213,0.003484,0.003728
+52,32,4372,0.007391,0.007759,0.008302,52,13,3892,0.003511,0.0038,0.004066
+53,33,3903,0.008202,0.008612,0.009215,53,14,3494,0.00384,0.004159,0.00445
+54,33,3647,0.009082,0.009528,0.010195,54,14,3295,0.0042,0.004544,0.004862
+55,36,3591,0.010029,0.010501,0.011236,55,15,3280,0.004595,0.004956,0.005303
+56,41,3683,0.011044,0.011532,0.01234,56,17,3402,0.005029,0.005399,0.005777
+57,46,3737,0.012127,0.012635,0.013519,57,19,3474,0.005507,0.00589,0.006302
+58,49,3691,0.013283,0.013817,0.014784,58,21,3505,0.006035,0.006434,0.006884
+59,51,3508,0.014521,0.015094,0.01615,59,23,3499,0.00662,0.007038,0.00753
+60,53,3282,0.015854,0.016472,0.017625,60,26,3556,0.007266,0.007701,0.00824
+61,53,3040,0.017296,0.017965,0.019223,61,29,3614,0.00798,0.008432,0.009022
+62,54,2819,0.01886,0.019585,0.020956,62,32,3661,0.008768,0.009238,0.009884
+63,56,2664,0.020561,0.021339,0.022833,63,35,3662,0.009638,0.01013,0.010839
+64,60,2637,0.022416,0.023232,0.024858,64,40,3747,0.010602,0.011112,0.011889
+65,66,2659,0.024455,0.025302,0.027073,65,46,3863,0.011674,0.0122,0.013054
+66,72,2518,0.02671,0.027618,0.029552,66,51,3742,0.01287,0.013431,0.014371
+67,66,2240,0.029228,0.030234,0.03235,67,49,3392,0.014217,0.014836,0.015874
+68,57,1596,0.032057,0.033301,0.035632,68,43,2455,0.015747,0.016511,0.017667
+69,48,1342,0.035238,0.036658,0.039224,69,37,2081,0.017497,0.018371,0.019657
+70,52,1328,0.038812,0.040306,0.043127,70,41,2093,0.019512,0.020431,0.021861
+71,68,1481,0.04282,0.044299,0.0474,71,55,2395,0.021845,0.022752,0.024344
+72,86,1807,0.047297,0.048701,0.05211,72,73,2991,0.024553,0.025412,0.027191
+73,104,1896,0.052277,0.053712,0.057472,73,90,3183,0.027694,0.028576,0.030576
+74,111,1886,0.057783,0.05929,0.06344,74,103,3219,0.031317,0.032247,0.034504
+75,117,1768,0.06383,0.065457,0.070039,75,111,3090,0.035469,0.036477,0.03903
+76,120,1641,0.070429,0.072194,0.077248,76,121,2955,0.040201,0.041294,0.044184
+77,123,1519,0.077593,0.079508,0.085073,77,131,2824,0.045557,0.046742,0.050014
+78,125,1400,0.085336,0.087415,0.093534,78,141,2677,0.051584,0.052873,0.056574
+79,125,1270,0.093674,0.095945,0.102662,79,148,2486,0.058324,0.059739,0.063921
+80,122,1134,0.102621,0.105119,0.112477,80,154,2260,0.065817,0.067384,0.072101
+81,120,998,0.112187,0.114948,0.122995,81,157,2018,0.074094,0.075842,0.081151
+82,114,866,0.12238,0.125449,0.134231,82,155,1789,0.083184,0.085137,0.091096
+83,106,736,0.133205,0.136647,0.146212,83,153,1575,0.093114,0.095299,0.10197
+84,95,613,0.14467,0.148564,0.158964,84,151,1378,0.103908,0.105353,0.113798
+85,84,500,0.156782,0.161226,0.172512,85,145,1178,0.115582,0.118344,0.126628
+86,74,397,0.169544,0.174669,0.186896,86,135,987,0.128145,0.131289,0.140479
+87,61,305,0.182952,0.188958,0.202185,87,124,806,0.141599,0.145214,0.155379
+88,50,227,0.196995,0.204124,0.218413,88,111,648,0.155939,0.160117,0.171325
+89,38,167,0.211661,0.220184,0.235597,89,97,514,0.171147,0.175998,0.188318
+90,31,122,0.226931,0.237094,0.253691,90,84,399,0.1872,0.192874,0.206375
+91,24,87,0.242777,0.255039,0.272891,91,68,300,0.204065,0.210801,0.225558
+92,18,62,0.259168,0.273965,0.293142,92,54,221,0.221699,0.229756,0.245839
+93,14,43,0.276066,0.294055,0.314638,93,43,158,0.240046,0.249785,0.26727
+94,10,29,0.293425,0.315644,0.337739,94,32,109,0.259042,0.271013,0.289983
+95,7,20,0.311199,0.338374,0.36206,95,24,73,0.27861,0.293464,0.314007
+96,5,13,0.329335,0.363301,0.388732,96,16,45,0.298664,0.317868,0.340119
+97,3,8,0.347778,0.391744,0.419166,97,11,29,0.31911,0.343353,0.367388
+98,2,5,0.366467,0.422438,0.452008,98,7,18,0.339848,0.371053,0.397027
+99,2,3,0.385341,0.454579,0.4864,99,5,11,0.360773,0.400699,0.428748
+100,1,2,0.404335,0.492651,0.527137,100,3,7,0.381775,0.432679,0.462967
diff --git a/inst/extdata/Germany_Endowments_DAV2008T.csv b/inst/extdata/Germany_Endowments_DAV2008T.csv
index b6313e4e952aba5c86c62285f71e808606d5abeb..903dd8f7c13836ed9fe4171535f281afc761ccb0 100644
--- a/inst/extdata/Germany_Endowments_DAV2008T.csv
+++ b/inst/extdata/Germany_Endowments_DAV2008T.csv
@@ -3,125 +3,125 @@ DAV 2008T R/NR Männer,,,,,,,,,,DAV 2008T R/NR Frauen,,,,,,,,,
 ,,,,,,,,,,,,,,,,,,,
 Alter,Raucheranteil,Raucher- übersterblichkeit,Nichtraucher- faktor,Sterblichkeit 2. Ordnung,,,Sterblichkeit 1. Ordnung,,,Alter,Raucheranteil,Raucher- übersterblichkeit,Nichtraucher- faktor,Sterblichkeit 2. Ordnung,,,Sterblichkeit 1. Ordnung,,
 ,,,,Aggregat, Nichtraucher,Raucher,Aggregat (Zuschlag 34%),Nichtraucher (Zuschlag 45%),Raucher (Zuschlag 45%),,,,,Aggregat, Nichtraucher,Raucher,Aggregat (Zuschlag 34%),Nichtraucher (Zuschlag 45%),Raucher (Zuschlag 45%)
-0,0%,100%,1,"0,004562","0,004562","0,004562","0,006113","0,006113","0,006615",0,0%,100%,1,"0,003797","0,003797","0,003797","0,005088","0,005088","0,005506"
-1,0%,100%,1,"0,000316","0,000316","0,000316","0,000423","0,000423","0,000458",1,0%,100%,1,"0,000289","0,000289","0,000289","0,000387","0,000387","0,000419"
-2,0%,100%,1,"0,000256","0,000256","0,000256","0,000343","0,000343","0,000371",2,0%,100%,1,"0,000237","0,000237","0,000237","0,000318","0,000318","0,000344"
-3,0%,100%,1,"0,000205","0,000205","0,000205","0,000275","0,000275","0,000297",3,0%,100%,1,"0,00019","0,00019","0,00019","0,000255","0,000255","0,000276"
-4,0%,100%,1,"0,000164","0,000164","0,000164","0,00022","0,00022","0,000238",4,0%,100%,1,"0,000151","0,000151","0,000151","0,000202","0,000202","0,000219"
-5,0%,100%,1,"0,000136","0,000136","0,000136","0,000182","0,000182","0,000197",5,0%,100%,1,"0,000122","0,000122","0,000122","0,000163","0,000163","0,000177"
-6,0%,100%,1,"0,000116","0,000116","0,000116","0,000155","0,000155","0,000168",6,0%,100%,1,"0,0001","0,0001","0,0001","0,000134","0,000134","0,000145"
-7,0%,100%,1,"0,000104","0,000104","0,000104","0,000139","0,000139","0,000151",7,0%,100%,1,"0,000086","0,000086","0,000086","0,000115","0,000115","0,000125"
-8,0%,"101,7%",1,"0,000096","0,000096","0,000098","0,000129","0,000129","0,000142",8,0%,"100,3%",1,"0,000078","0,000078","0,000078","0,000105","0,000105","0,000113"
-9,0%,"103,4%",1,"0,000093","0,000093","0,000096","0,000125","0,000125","0,000139",9,0%,"101,5%",1,"0,000074","0,000074","0,000075","0,000099","0,000099","0,000109"
-10,0%,"105,1%",1,"0,000096","0,000096","0,000101","0,000129","0,000129","0,000146",10,0%,"103,3%",1,"0,000076","0,000076","0,000079","0,000102","0,000102","0,000115"
-11,0%,"106,6%",1,"0,000107","0,000107","0,000114","0,000143","0,000143","0,000165",11,0%,"105,8%",1,"0,000083","0,000083","0,000088","0,000111","0,000111","0,000128"
-12,0%,"108,1%",1,"0,000129","0,000129","0,000139","0,000173","0,000173","0,000202",12,0%,"108,8%",1,"0,000095","0,000095","0,000103","0,000127","0,000127","0,000149"
-13,0%,"109,5%",1,"0,000166","0,000166","0,000182","0,000222","0,000222","0,000264",13,0%,"112,3%",1,"0,000114","0,000114","0,000128","0,000153","0,000153","0,000186"
-14,0%,"110,7%",1,"0,000226","0,000226","0,00025","0,000303","0,000303","0,000363",14,0%,"116,2%",1,"0,00014","0,00014","0,000163","0,000188","0,000188","0,000236"
-15,"4,6%","111,7%","0,994647","0,000311","0,000309","0,000346","0,000417","0,000417","0,000502",15,"4,7%","120,3%","0,990549","0,00017","0,000168","0,000203","0,000228","0,000228","0,000294"
-16,"11,2%","112,4%","0,986302","0,000416","0,00041","0,000461","0,000557","0,000557","0,000668",16,"10,2%","124,2%","0,975911","0,000202","0,000197","0,000245","0,000271","0,000271","0,000355"
-17,"16,8%","112,9%","0,978788","0,000529","0,000518","0,000585","0,000709","0,000709","0,000848",17,"14,9%","127,9%","0,960088","0,000231","0,000222","0,000284","0,00031","0,00031","0,000412"
-18,"21,6%","112,9%","0,972891","0,000634","0,000617","0,000696","0,00085","0,00085","0,001009",18,"18,8%",131%,"0,94493","0,000242","0,000229","0,0003","0,000324","0,000324","0,000435"
-19,"25,5%","112,6%","0,96887","0,000711","0,000689","0,000776","0,000953","0,000953","0,001125",19,"21,9%","133,4%","0,93184","0,000246","0,000229","0,000306","0,00033","0,00033","0,000444"
-20,"28,6%","112,1%","0,966552","0,000755","0,00073","0,000818","0,001012","0,001012","0,001186",20,"24,2%",135%,"0,921914","0,000245","0,000226","0,000305","0,000328","0,000328","0,000442"
-21,"30,8%","111,4%","0,966079","0,000763","0,000737","0,000821","0,001022","0,001022","0,00119",21,"25,7%","135,9%","0,91553","0,00024","0,00022","0,000299","0,000322","0,000319","0,000434"
-22,"32,3%","110,9%","0,96599","0,000749","0,000724","0,000802","0,001004","0,001004","0,001163",22,"26,5%","136,5%","0,911806","0,000234","0,000213","0,000291","0,000314","0,000309","0,000422"
-23,33%,111%,"0,964972","0,000719","0,000694","0,00077","0,000963","0,000963","0,001117",23,"26,6%","137,2%","0,909958","0,000227","0,000207","0,000283","0,000304","0,0003","0,00041"
-24,"33,2%",112%,"0,961686","0,00068","0,000654","0,000732","0,000911","0,000911","0,001061",24,"26,2%","138,8%","0,907724","0,000222","0,000202","0,00028","0,000297","0,000293","0,000406"
-25,33%,"114,5%","0,954335","0,000639","0,00061","0,000698","0,000856","0,000856","0,001012",25,"25,5%","141,8%","0,903677","0,000219","0,000198","0,000281","0,000293","0,000287","0,000407"
-26,"32,6%","118,7%","0,942541","0,000603","0,000568","0,000675","0,000808","0,000808","0,000979",26,"24,7%",147%,"0,895985","0,000218","0,000195","0,000287","0,000292","0,000283","0,000416"
-27,"32,2%","124,9%","0,925773","0,000576","0,000533","0,000666","0,000772","0,000772","0,000966",27,"23,7%","154,4%","0,885796","0,000218","0,000193","0,000298","0,000292","0,00028","0,000432"
-28,"31,7%","132,9%","0,905557","0,000561","0,000508","0,000675","0,000752","0,000737","0,000979",28,"22,9%","164,2%","0,871826","0,000221","0,000193","0,000316","0,000296","0,00028","0,000458"
-29,"31,4%","142,5%","0,882262","0,000556","0,000491","0,000699","0,000745","0,000712","0,001014",29,"22,3%","175,7%","0,85557","0,000225","0,000193","0,000338","0,000302","0,00028","0,00049"
-30,"31,1%","152,9%","0,858724","0,000561","0,000482","0,000737","0,000752","0,000699","0,001069",30,"21,9%",188%,"0,83842","0,000232","0,000195","0,000366","0,000311","0,000283","0,000531"
-31,31%,"163,5%","0,835527","0,000573","0,000479","0,000783","0,000768","0,000695","0,001135",31,"21,7%","200,3%","0,821253","0,000244","0,0002","0,000401","0,000327","0,00029","0,000581"
-32,"30,9%","173,7%","0,814509","0,00059","0,000481","0,000835","0,000791","0,000697","0,001211",32,"21,7%","211,6%","0,805041","0,000262","0,000211","0,000446","0,000351","0,000306","0,000647"
-33,"30,8%","183,2%","0,796016","0,000612","0,000487","0,000892","0,00082","0,000706","0,001293",33,"21,9%","221,1%","0,790383","0,000288","0,000228","0,000503","0,000386","0,000331","0,000729"
-34,"30,8%","191,6%","0,779953","0,000638","0,000498","0,000953","0,000855","0,000722","0,001382",34,"22,2%","228,6%","0,777912","0,000323","0,000251","0,000574","0,000433","0,000364","0,000832"
-35,"30,8%","199,2%","0,765969","0,000668","0,000512","0,001019","0,000895","0,000742","0,001478",35,"22,6%",234%,"0,767554","0,000366","0,000281","0,000657","0,00049","0,000407","0,000953"
-36,"30,8%",206%,"0,753875","0,000705","0,000531","0,001095","0,000945","0,00077","0,001588",36,"23,1%","237,7%","0,758675","0,000414","0,000314","0,000747","0,000555","0,000455","0,001083"
-37,"30,8%","212,3%","0,743006","0,00075","0,000557","0,001183","0,001005","0,000808","0,001715",37,"23,7%",240%,"0,750863","0,000466","0,00035","0,00084","0,000624","0,000508","0,001218"
-38,"30,9%","218,3%","0,732307","0,000808","0,000592","0,001292","0,001083","0,000858","0,001873",38,"24,2%","241,2%","0,745321","0,000523","0,00039","0,00094","0,000701","0,000566","0,001363"
-39,31%,"224,2%","0,722011","0,000881","0,000636","0,001426","0,001181","0,000922","0,002068",39,"24,8%","241,7%","0,739965","0,000584","0,000432","0,001044","0,000783","0,000626","0,001514"
-40,"31,1%",230%,"0,712099","0,000971","0,000691","0,00159","0,001301","0,001002","0,002306",40,"25,3%","241,7%","0,736105","0,000651","0,000479","0,001158","0,000872","0,000695","0,001679"
-41,"31,3%","235,6%","0,702036","0,00108","0,000758","0,001786","0,001447","0,001099","0,00259",41,"25,7%","241,4%","0,733462","0,000725","0,000532","0,001284","0,000972","0,000771","0,001862"
-42,"31,5%","240,9%","0,6926","0,001211","0,000839","0,002021","0,001623","0,001217","0,00293",42,26%,"241,1%","0,731604","0,000809","0,000592","0,001427","0,001084","0,000858","0,002069"
-43,"31,7%","245,9%","0,683759","0,001368","0,000935","0,0023","0,001833","0,001356","0,003335",43,"26,2%","240,7%","0,730656","0,000905","0,000661","0,001592","0,001213","0,000958","0,002308"
-44,"31,7%","250,5%","0,677009","0,001554","0,001052","0,002635","0,002082","0,001525","0,003821",44,"26,3%","240,5%","0,730186","0,001014","0,00074","0,001781","0,001359","0,001073","0,002582"
-45,"31,7%","254,5%","0,671247","0,001764","0,001184","0,003013","0,002364","0,001717","0,004369",45,"26,2%","240,5%","0,730935","0,001137","0,000831","0,001999","0,001524","0,001205","0,002899"
-46,"31,4%","257,8%","0,668676","0,001992","0,001332","0,003434","0,002669","0,001931","0,004979",46,"25,9%","240,7%","0,732916","0,001273","0,000933","0,002246","0,001706","0,001353","0,003257"
-47,"30,9%","260,6%","0,668336","0,002226","0,001488","0,003877","0,002983","0,002158","0,005622",47,"25,4%","241,2%","0,736026","0,00142","0,001045","0,002521","0,001903","0,001515","0,003655"
-48,"30,1%","262,7%","0,671264","0,002464","0,001654","0,004345","0,003302","0,002398","0,0063",48,"24,7%",242%,"0,740335","0,001574","0,001165","0,00282","0,002109","0,001689","0,004089"
-49,"29,2%","264,3%","0,675787","0,002709","0,001831","0,004839","0,00363","0,002655","0,007017",49,"23,8%","243,2%","0,745814","0,001734","0,001293","0,003145","0,002324","0,001875","0,00456"
-50,"28,3%","265,4%","0,681161","0,002971","0,002024","0,005371","0,003981","0,002935","0,007788",50,"22,9%","244,8%","0,750981","0,0019","0,001427","0,003493","0,002546","0,002069","0,005065"
-51,"27,3%","266,2%","0,687888","0,003262","0,002244","0,005973","0,004371","0,003254","0,008661",51,"21,9%","246,8%","0,75672","0,002076","0,001571","0,003877","0,002782","0,002278","0,005622"
-52,"26,5%","266,7%","0,693599","0,003591","0,002491","0,006643","0,004812","0,003612","0,009632",52,"20,9%","249,1%","0,762417","0,002265","0,001727","0,004302","0,003035","0,002504","0,006238"
-53,"25,7%",267%,"0,699697","0,003961","0,002771","0,0074","0,005308","0,004018","0,01073",53,20%,"251,8%","0,767106","0,002467","0,001892","0,004765","0,003306","0,002743","0,006909"
-54,"25,1%","267,3%","0,704264","0,004371","0,003078","0,008228","0,005857","0,004463","0,011931",54,"19,1%","254,8%","0,771803","0,002681","0,002069","0,005272","0,003593","0,003","0,007644"
-55,"24,5%","267,6%","0,708908","0,004821","0,003418","0,009146","0,00646","0,004956","0,013262",55,"18,2%","258,1%","0,776553","0,002909","0,002259","0,00583","0,003898","0,003276","0,008454"
-56,"23,8%","267,9%","0,714489","0,005311","0,003795","0,010166","0,007117","0,005503","0,014741",56,"17,2%","261,6%","0,782502","0,003155","0,002469","0,006458","0,004228","0,00358","0,009364"
-57,"22,9%","268,2%","0,721929","0,005844","0,004219","0,011315","0,007831","0,006118","0,016407",57,"16,3%","265,2%","0,787851","0,003422","0,002696","0,00715","0,004585","0,003909","0,010368"
-58,"21,9%","268,6%","0,730335","0,006421","0,004689","0,012596","0,008604","0,006799","0,018264",58,"15,3%","268,8%","0,794746","0,003712","0,00295","0,00793","0,004974","0,004278","0,011499"
-59,"20,7%",269%,"0,740834","0,007055","0,005227","0,01406","0,009454","0,007579","0,020387",59,"14,2%","272,4%","0,803337","0,004031","0,003238","0,008821","0,005402","0,004695","0,01279"
-60,"19,4%","269,2%","0,752871","0,007764","0,005845","0,015736","0,010404","0,008475","0,022817",60,"13,1%","275,7%","0,812898","0,004391","0,003569","0,009841","0,005884","0,005175","0,014269"
-61,"18,1%","269,3%","0,765443","0,008585","0,006571","0,017697","0,011504","0,009528","0,025661",61,"12,1%","278,8%","0,822133","0,004813","0,003957","0,011032","0,006449","0,005738","0,015996"
-62,"16,9%","269,1%","0,777739","0,009566","0,00744","0,020021","0,012818","0,010788","0,02903",62,"11,1%","281,5%","0,832317","0,005318","0,004426","0,01246","0,007126","0,006418","0,018067"
-63,"15,9%","268,6%","0,788598","0,010768","0,008492","0,022809","0,014429","0,012313","0,033073",63,"10,2%","283,6%","0,842267","0,005922","0,004988","0,014146","0,007935","0,007233","0,020512"
-64,"15,1%","267,5%","0,798132","0,01225","0,009777","0,026154","0,016415","0,014177","0,037923",64,"9,5%","285,2%","0,850384","0,00664","0,005647","0,016104","0,008898","0,008188","0,023351"
-65,"14,3%",266%,"0,808159","0,014054","0,011358","0,030212","0,018832","0,016469","0,043807",65,"8,8%",286%,"0,859343","0,007481","0,006429","0,018386","0,010025","0,009322","0,02666"
-66,"13,7%","263,9%","0,816631","0,016197","0,013227","0,034906","0,021704","0,019179","0,050614",66,"8,2%","286,1%","0,867602","0,00845","0,007331","0,020975","0,011323","0,01063","0,030414"
-67,"13,2%","261,1%","0,824639","0,018669","0,015395","0,040197","0,025016","0,022323","0,058286",67,"7,6%","285,4%","0,876498","0,00955","0,008371","0,02389","0,012797","0,012138","0,034641"
-68,"12,6%","257,7%","0,834236","0,021446","0,017891","0,046105","0,028738","0,025942","0,066852",68,"7,1%","283,8%","0,884566","0,010791","0,009545","0,02709","0,01446","0,01384","0,039281"
-69,"12,1%","253,7%","0,843187","0,024494","0,020653","0,052397","0,032822","0,029947","0,075976",69,"6,6%","281,3%","0,89313","0,012188","0,010885","0,030621","0,016332","0,015783","0,0444"
-70,"11,6%","249,1%","0,852547","0,027775","0,023679","0,058986","0,037219","0,034335","0,08553",70,"6,1%",278%,"0,902055","0,013761","0,012413","0,034509","0,01844","0,017999","0,050038"
-71,11%,"243,9%","0,863342","0,031254","0,026983","0,065811","0,04188","0,039125","0,095426",71,"5,6%","273,8%","0,911305","0,015532","0,014154","0,038755","0,020813","0,020523","0,056195"
-72,"10,5%","238,2%","0,873279","0,034774","0,030367","0,072335","0,046597","0,044032","0,104886",72,"5,2%","268,8%","0,919307","0,017519","0,016105","0,043291","0,023475","0,023352","0,062772"
-73,10%,"232,1%","0,883314","0,038195","0,033738","0,078306","0,051181","0,04892","0,113544",73,"4,8%",263%,"0,927437","0,020175","0,018711","0,04921","0,027035","0,027035","0,071355"
-74,"9,5%","225,6%","0,8934","0,041873","0,037409","0,084395","0,05611","0,054243","0,122373",74,"4,5%","256,4%","0,934248","0,022696","0,021204","0,054366","0,030413","0,030413","0,078831"
-75,"9,1%","218,8%","0,902439","0,045878","0,041402","0,090588","0,061477","0,060033","0,131353",75,"4,2%","249,2%","0,941031","0,025587","0,024078","0,060003","0,034287","0,034287","0,087004"
-76,"8,7%","211,7%","0,911428","0,050323","0,045866","0,097098","0,067433","0,066506","0,140792",76,"3,9%","241,4%","0,947736","0,028917","0,027406","0,066157","0,038749","0,038749","0,095928"
-77,"8,4%","204,5%","0,919304","0,055343","0,050877","0,104044","0,07416","0,073772","0,150864",77,"3,6%","233,2%","0,954242","0,032789","0,031289","0,072965","0,043937","0,043937","0,105799"
-78,"8,1%","197,3%","0,926945","0,061049","0,056589","0,11165","0,081806","0,081806","0,161893",78,"3,5%","224,5%","0,958244","0,037308","0,03575","0,080259","0,049993","0,049993","0,116376"
-79,"7,9%",190%,"0,93362","0,067521","0,063039","0,119774","0,090478","0,090478","0,173672",79,"3,3%","215,5%","0,963284","0,042555","0,040993","0,088339","0,057024","0,057024","0,128092"
-80,"7,7%","182,8%","0,940065","0,074822","0,070338","0,128577","0,100261","0,100261","0,186437",80,"3,2%","206,3%","0,967103","0,048592","0,046993","0,096948","0,065113","0,065113","0,140575"
-81,"7,5%","175,8%","0,946208","0,08298","0,078516","0,138032","0,111193","0,111193","0,200146",81,"3,1%","197,1%","0,970779","0,055439","0,053819","0,106077","0,074288","0,074288","0,153812"
-82,"7,4%",169%,"0,95142","0,092002","0,087533","0,14793","0,123283","0,123283","0,214499",82,3%,"187,9%","0,974308","0,063127","0,061505","0,115568","0,08459","0,08459","0,167574"
-83,"7,3%","162,5%","0,956366","0,101864","0,097419","0,158306","0,136498","0,136498","0,229544",83,3%,"178,8%","0,976906","0,071713","0,070057","0,125262","0,096095","0,096095","0,18163"
-84,"7,2%","156,3%","0,961043","0,112602","0,108215","0,169141","0,150887","0,150887","0,245254",84,"2,9%","169,9%","0,980132","0,081364","0,079747","0,135491","0,109028","0,109028","0,196462"
-85,"7,2%","150,5%","0,964916","0,124254","0,119895","0,180441","0,1665","0,1665","0,261639",85,"2,9%","161,4%","0,982506","0,092247","0,090633","0,146282","0,123611","0,123611","0,212109"
-86,"7,2%",145%,"0,968617","0,136824","0,13253","0,192169","0,183344","0,183344","0,278645",86,"2,9%","153,2%","0,984806","0,104494","0,102906","0,157652","0,140022","0,140022","0,228595"
-87,"7,1%",140%,"0,972384","0,150241","0,146092","0,204529","0,201323","0,201323","0,296567",87,"2,9%","145,5%","0,986977","0,118102","0,116564","0,169601","0,158257","0,158257","0,245921"
-88,"7,1%","135,3%","0,97555","0,164391","0,160372","0,216983","0,220284","0,220284","0,314625",88,3%,"138,3%","0,988641","0,132974","0,131464","0,181814","0,178185","0,178185","0,26363"
-89,"7,1%","131,1%","0,978396","0,179159","0,175288","0,229803","0,240073","0,240073","0,333214",89,3%,"131,6%","0,990609","0,149007","0,147608","0,194252","0,199669","0,199669","0,281665"
-90,"7,1%","127,2%","0,981054","0,194445","0,190761","0,242648","0,260556","0,260556","0,35184",90,3%,"125,4%","0,992438","0,166048","0,164792","0,20665","0,222504","0,222504","0,299643"
-91,"7,1%","123,7%","0,983451","0,210151","0,206673","0,255655","0,281602","0,281602","0,3707",91,"3,1%","119,9%","0,993869","0,18392","0,182792","0,219168","0,246453","0,246453","0,317794"
-92,"7,1%","120,5%","0,985654","0,226178","0,222933","0,268635","0,303079","0,303079","0,389521",92,"3,1%","114,9%","0,995402","0,202384","0,201453","0,23147","0,271195","0,271195","0,335632"
-93,"7,1%","117,7%","0,987589","0,242442","0,239433","0,281813","0,324872","0,324872","0,408629",93,"3,1%","110,6%","0,996725","0,220585","0,219863","0,243168","0,295584","0,295584","0,352594"
-94,"7,1%","115,1%","0,989393","0,258871","0,256125","0,2948","0,346887","0,346887","0,42746",94,"3,2%","106,8%","0,997829","0,23833","0,237813","0,253984","0,319362","0,319362","0,368277"
-95,"7,1%","112,8%","0,990994","0,275411","0,272931","0,307866","0,369051","0,369051","0,446406",95,"3,2%","103,7%","0,998817","0,256299","0,255996","0,265468","0,343441","0,343441","0,384929"
-96,"7,1%","110,8%","0,99239","0,292019","0,289797","0,321095","0,391305","0,391305","0,465588",96,"3,2%",100%,1,"0,274491","0,274491","0,274491","0,367818","0,367818","0,398012"
-97,7%,"108,9%","0,993809","0,308909","0,306997","0,334319","0,413938","0,413938","0,484763",97,"3,3%",100%,1,"0,292905","0,292905","0,292905","0,392493","0,392493","0,424712"
-98,7%,"107,3%","0,994916","0,326353","0,324694","0,348396","0,437313","0,437313","0,505174",98,"3,3%",100%,1,"0,311537","0,311537","0,311537","0,41746","0,41746","0,451729"
-99,"6,9%","105,8%","0,996014","0,344105","0,342733","0,362612","0,461101","0,461101","0,525787",99,"3,3%",100%,1,"0,330385","0,330385","0,330385","0,442716","0,442716","0,479058"
-100,"6,8%","104,5%","0,996949","0,362167","0,361062","0,37731","0,485304","0,485304","0,5471",100,"3,3%",100%,1,"0,349446","0,349446","0,349446","0,468258","0,468258","0,506697"
-101,"6,7%","103,4%","0,997727","0,38054","0,379675","0,392584","0,509924","0,509924","0,569247",101,"3,2%",100%,1,"0,368713","0,368713","0,368713","0,494075","0,494075","0,534634"
-102,"6,6%","102,5%","0,998353","0,399222","0,398564","0,408529","0,534957","0,534957","0,592367",102,"3,2%",100%,1,"0,388182","0,388182","0,388182","0,520164","0,520164","0,562864"
-103,"6,4%","101,7%","0,998913","0,418214","0,417759","0,424861","0,560407","0,560407","0,616048",103,"3,2%",100%,1,"0,407846","0,407846","0,407846","0,546514","0,546514","0,591377"
-104,"6,2%","101,1%","0,999318","0,437511","0,437213","0,442022","0,586265","0,586265","0,640932",104,"3,1%",100%,1,"0,427697","0,427697","0,427697","0,573114","0,573114","0,620161"
-105,"6,1%","100,7%","0,999573","0,457111","0,456916","0,460114","0,612529","0,612529","0,667165",105,3%,100%,1,"0,447726","0,447726","0,447726","0,599953","0,599953","0,649203"
-106,"5,8%",100%,1,"0,477006","0,477006","0,477006","0,639188","0,639188","0,691659",106,"2,9%",100%,1,"0,467921","0,467921","0,467921","0,627014","0,627014","0,678485"
-107,"5,6%",100%,1,"0,497189","0,497189","0,497189","0,666233","0,666233","0,720924",107,"2,8%",100%,1,"0,488271","0,488271","0,488271","0,654283","0,654283","0,707993"
-108,"5,3%",100%,1,"0,51765","0,51765","0,51765","0,693651","0,693651","0,750593",108,"2,7%",100%,1,"0,508762","0,508762","0,508762","0,681741","0,681741","0,737705"
-109,5%,100%,1,"0,538377","0,538377","0,538377","0,721425","0,721425","0,780647",109,"2,6%",100%,1,"0,529376","0,529376","0,529376","0,709364","0,709364","0,767595"
-110,"4,7%",100%,1,"0,559353","0,559353","0,559353","0,749533","0,749533","0,811062",110,"2,4%",100%,1,"0,550097","0,550097","0,550097","0,73713","0,73713","0,797641"
-111,"4,4%",100%,1,"0,58056","0,58056","0,58056","0,77795","0,77795","0,841812",111,"2,3%",100%,1,"0,570904","0,570904","0,570904","0,765011","0,765011","0,827811"
-112,4%,100%,1,"0,601975","0,601975","0,601975","0,806647","0,806647","0,872864",112,"2,1%",100%,1,"0,591772","0,591772","0,591772","0,792974","0,792974","0,858069"
-113,"3,6%",100%,1,"0,623571","0,623571","0,623571","0,835585","0,835585","0,904178",113,"1,9%",100%,1,"0,612677","0,612677","0,612677","0,820987","0,820987","0,888382"
-114,"3,2%",100%,1,"0,645315","0,645315","0,645315","0,864722","0,864722","0,935707",114,"1,7%",100%,1,"0,633589","0,633589","0,633589","0,849009","0,849009","0,918704"
-115,"2,7%",100%,1,"0,66717","0,66717","0,66717","0,894008","0,894008","0,967397",115,"1,4%",100%,1,"0,654476","0,654476","0,654476","0,876998","0,876998","0,94899"
-116,"2,2%",100%,1,"0,689091","0,689091","0,689091","0,923382","0,923382","0,999182",116,"1,2%",100%,1,"0,675302","0,675302","0,675302","0,904905","0,904905","0,979188"
-117,"1,7%",100%,1,"0,711028","0,711028","0,711028","0,952778","0,952778",1,117,"0,9%",100%,1,"0,696026","0,696026","0,696026","0,932675","0,932675",1
-118,"1,2%",100%,1,"0,73292","0,73292","0,73292","0,982113","0,982113",1,118,"0,6%",100%,1,"0,716604","0,716604","0,716604","0,960249","0,960249",1
-119,"0,6%",100%,1,"0,754701","0,754701","0,754701",1,1,1,119,"0,3%",100%,1,"0,736988","0,736988","0,736988","0,987564","0,987564",1
-120,0%,100%,1,"0,776292","0,776292","0,776292",1,1,1,120,0%,100%,1,"0,757123","0,757123","0,757123",1,1,1
+0,0%,100%,1,0.004562,0.004562,0.004562,0.006113,0.006113,0.006615,0,0%,100%,1,0.003797,0.003797,0.003797,0.005088,0.005088,0.005506
+1,0%,100%,1,0.000316,0.000316,0.000316,0.000423,0.000423,0.000458,1,0%,100%,1,0.000289,0.000289,0.000289,0.000387,0.000387,0.000419
+2,0%,100%,1,0.000256,0.000256,0.000256,0.000343,0.000343,0.000371,2,0%,100%,1,0.000237,0.000237,0.000237,0.000318,0.000318,0.000344
+3,0%,100%,1,0.000205,0.000205,0.000205,0.000275,0.000275,0.000297,3,0%,100%,1,0.00019,0.00019,0.00019,0.000255,0.000255,0.000276
+4,0%,100%,1,0.000164,0.000164,0.000164,0.00022,0.00022,0.000238,4,0%,100%,1,0.000151,0.000151,0.000151,0.000202,0.000202,0.000219
+5,0%,100%,1,0.000136,0.000136,0.000136,0.000182,0.000182,0.000197,5,0%,100%,1,0.000122,0.000122,0.000122,0.000163,0.000163,0.000177
+6,0%,100%,1,0.000116,0.000116,0.000116,0.000155,0.000155,0.000168,6,0%,100%,1,0.0001,0.0001,0.0001,0.000134,0.000134,0.000145
+7,0%,100%,1,0.000104,0.000104,0.000104,0.000139,0.000139,0.000151,7,0%,100%,1,0.000086,0.000086,0.000086,0.000115,0.000115,0.000125
+8,0%,101.7%,1,0.000096,0.000096,0.000098,0.000129,0.000129,0.000142,8,0%,100.3%,1,0.000078,0.000078,0.000078,0.000105,0.000105,0.000113
+9,0%,103.4%,1,0.000093,0.000093,0.000096,0.000125,0.000125,0.000139,9,0%,101.5%,1,0.000074,0.000074,0.000075,0.000099,0.000099,0.000109
+10,0%,105.1%,1,0.000096,0.000096,0.000101,0.000129,0.000129,0.000146,10,0%,103.3%,1,0.000076,0.000076,0.000079,0.000102,0.000102,0.000115
+11,0%,106.6%,1,0.000107,0.000107,0.000114,0.000143,0.000143,0.000165,11,0%,105.8%,1,0.000083,0.000083,0.000088,0.000111,0.000111,0.000128
+12,0%,108.1%,1,0.000129,0.000129,0.000139,0.000173,0.000173,0.000202,12,0%,108.8%,1,0.000095,0.000095,0.000103,0.000127,0.000127,0.000149
+13,0%,109.5%,1,0.000166,0.000166,0.000182,0.000222,0.000222,0.000264,13,0%,112.3%,1,0.000114,0.000114,0.000128,0.000153,0.000153,0.000186
+14,0%,110.7%,1,0.000226,0.000226,0.00025,0.000303,0.000303,0.000363,14,0%,116.2%,1,0.00014,0.00014,0.000163,0.000188,0.000188,0.000236
+15,4.6%,111.7%,0.994647,0.000311,0.000309,0.000346,0.000417,0.000417,0.000502,15,4.7%,120.3%,0.990549,0.00017,0.000168,0.000203,0.000228,0.000228,0.000294
+16,11.2%,112.4%,0.986302,0.000416,0.00041,0.000461,0.000557,0.000557,0.000668,16,10.2%,124.2%,0.975911,0.000202,0.000197,0.000245,0.000271,0.000271,0.000355
+17,16.8%,112.9%,0.978788,0.000529,0.000518,0.000585,0.000709,0.000709,0.000848,17,14.9%,127.9%,0.960088,0.000231,0.000222,0.000284,0.00031,0.00031,0.000412
+18,21.6%,112.9%,0.972891,0.000634,0.000617,0.000696,0.00085,0.00085,0.001009,18,18.8%,131%,0.94493,0.000242,0.000229,0.0003,0.000324,0.000324,0.000435
+19,25.5%,112.6%,0.96887,0.000711,0.000689,0.000776,0.000953,0.000953,0.001125,19,21.9%,133.4%,0.93184,0.000246,0.000229,0.000306,0.00033,0.00033,0.000444
+20,28.6%,112.1%,0.966552,0.000755,0.00073,0.000818,0.001012,0.001012,0.001186,20,24.2%,135%,0.921914,0.000245,0.000226,0.000305,0.000328,0.000328,0.000442
+21,30.8%,111.4%,0.966079,0.000763,0.000737,0.000821,0.001022,0.001022,0.00119,21,25.7%,135.9%,0.91553,0.00024,0.00022,0.000299,0.000322,0.000319,0.000434
+22,32.3%,110.9%,0.96599,0.000749,0.000724,0.000802,0.001004,0.001004,0.001163,22,26.5%,136.5%,0.911806,0.000234,0.000213,0.000291,0.000314,0.000309,0.000422
+23,33%,111%,0.964972,0.000719,0.000694,0.00077,0.000963,0.000963,0.001117,23,26.6%,137.2%,0.909958,0.000227,0.000207,0.000283,0.000304,0.0003,0.00041
+24,33.2%,112%,0.961686,0.00068,0.000654,0.000732,0.000911,0.000911,0.001061,24,26.2%,138.8%,0.907724,0.000222,0.000202,0.00028,0.000297,0.000293,0.000406
+25,33%,114.5%,0.954335,0.000639,0.00061,0.000698,0.000856,0.000856,0.001012,25,25.5%,141.8%,0.903677,0.000219,0.000198,0.000281,0.000293,0.000287,0.000407
+26,32.6%,118.7%,0.942541,0.000603,0.000568,0.000675,0.000808,0.000808,0.000979,26,24.7%,147%,0.895985,0.000218,0.000195,0.000287,0.000292,0.000283,0.000416
+27,32.2%,124.9%,0.925773,0.000576,0.000533,0.000666,0.000772,0.000772,0.000966,27,23.7%,154.4%,0.885796,0.000218,0.000193,0.000298,0.000292,0.00028,0.000432
+28,31.7%,132.9%,0.905557,0.000561,0.000508,0.000675,0.000752,0.000737,0.000979,28,22.9%,164.2%,0.871826,0.000221,0.000193,0.000316,0.000296,0.00028,0.000458
+29,31.4%,142.5%,0.882262,0.000556,0.000491,0.000699,0.000745,0.000712,0.001014,29,22.3%,175.7%,0.85557,0.000225,0.000193,0.000338,0.000302,0.00028,0.00049
+30,31.1%,152.9%,0.858724,0.000561,0.000482,0.000737,0.000752,0.000699,0.001069,30,21.9%,188%,0.83842,0.000232,0.000195,0.000366,0.000311,0.000283,0.000531
+31,31%,163.5%,0.835527,0.000573,0.000479,0.000783,0.000768,0.000695,0.001135,31,21.7%,200.3%,0.821253,0.000244,0.0002,0.000401,0.000327,0.00029,0.000581
+32,30.9%,173.7%,0.814509,0.00059,0.000481,0.000835,0.000791,0.000697,0.001211,32,21.7%,211.6%,0.805041,0.000262,0.000211,0.000446,0.000351,0.000306,0.000647
+33,30.8%,183.2%,0.796016,0.000612,0.000487,0.000892,0.00082,0.000706,0.001293,33,21.9%,221.1%,0.790383,0.000288,0.000228,0.000503,0.000386,0.000331,0.000729
+34,30.8%,191.6%,0.779953,0.000638,0.000498,0.000953,0.000855,0.000722,0.001382,34,22.2%,228.6%,0.777912,0.000323,0.000251,0.000574,0.000433,0.000364,0.000832
+35,30.8%,199.2%,0.765969,0.000668,0.000512,0.001019,0.000895,0.000742,0.001478,35,22.6%,234%,0.767554,0.000366,0.000281,0.000657,0.00049,0.000407,0.000953
+36,30.8%,206%,0.753875,0.000705,0.000531,0.001095,0.000945,0.00077,0.001588,36,23.1%,237.7%,0.758675,0.000414,0.000314,0.000747,0.000555,0.000455,0.001083
+37,30.8%,212.3%,0.743006,0.00075,0.000557,0.001183,0.001005,0.000808,0.001715,37,23.7%,240%,0.750863,0.000466,0.00035,0.00084,0.000624,0.000508,0.001218
+38,30.9%,218.3%,0.732307,0.000808,0.000592,0.001292,0.001083,0.000858,0.001873,38,24.2%,241.2%,0.745321,0.000523,0.00039,0.00094,0.000701,0.000566,0.001363
+39,31%,224.2%,0.722011,0.000881,0.000636,0.001426,0.001181,0.000922,0.002068,39,24.8%,241.7%,0.739965,0.000584,0.000432,0.001044,0.000783,0.000626,0.001514
+40,31.1%,230%,0.712099,0.000971,0.000691,0.00159,0.001301,0.001002,0.002306,40,25.3%,241.7%,0.736105,0.000651,0.000479,0.001158,0.000872,0.000695,0.001679
+41,31.3%,235.6%,0.702036,0.00108,0.000758,0.001786,0.001447,0.001099,0.00259,41,25.7%,241.4%,0.733462,0.000725,0.000532,0.001284,0.000972,0.000771,0.001862
+42,31.5%,240.9%,0.6926,0.001211,0.000839,0.002021,0.001623,0.001217,0.00293,42,26%,241.1%,0.731604,0.000809,0.000592,0.001427,0.001084,0.000858,0.002069
+43,31.7%,245.9%,0.683759,0.001368,0.000935,0.0023,0.001833,0.001356,0.003335,43,26.2%,240.7%,0.730656,0.000905,0.000661,0.001592,0.001213,0.000958,0.002308
+44,31.7%,250.5%,0.677009,0.001554,0.001052,0.002635,0.002082,0.001525,0.003821,44,26.3%,240.5%,0.730186,0.001014,0.00074,0.001781,0.001359,0.001073,0.002582
+45,31.7%,254.5%,0.671247,0.001764,0.001184,0.003013,0.002364,0.001717,0.004369,45,26.2%,240.5%,0.730935,0.001137,0.000831,0.001999,0.001524,0.001205,0.002899
+46,31.4%,257.8%,0.668676,0.001992,0.001332,0.003434,0.002669,0.001931,0.004979,46,25.9%,240.7%,0.732916,0.001273,0.000933,0.002246,0.001706,0.001353,0.003257
+47,30.9%,260.6%,0.668336,0.002226,0.001488,0.003877,0.002983,0.002158,0.005622,47,25.4%,241.2%,0.736026,0.00142,0.001045,0.002521,0.001903,0.001515,0.003655
+48,30.1%,262.7%,0.671264,0.002464,0.001654,0.004345,0.003302,0.002398,0.0063,48,24.7%,242%,0.740335,0.001574,0.001165,0.00282,0.002109,0.001689,0.004089
+49,29.2%,264.3%,0.675787,0.002709,0.001831,0.004839,0.00363,0.002655,0.007017,49,23.8%,243.2%,0.745814,0.001734,0.001293,0.003145,0.002324,0.001875,0.00456
+50,28.3%,265.4%,0.681161,0.002971,0.002024,0.005371,0.003981,0.002935,0.007788,50,22.9%,244.8%,0.750981,0.0019,0.001427,0.003493,0.002546,0.002069,0.005065
+51,27.3%,266.2%,0.687888,0.003262,0.002244,0.005973,0.004371,0.003254,0.008661,51,21.9%,246.8%,0.75672,0.002076,0.001571,0.003877,0.002782,0.002278,0.005622
+52,26.5%,266.7%,0.693599,0.003591,0.002491,0.006643,0.004812,0.003612,0.009632,52,20.9%,249.1%,0.762417,0.002265,0.001727,0.004302,0.003035,0.002504,0.006238
+53,25.7%,267%,0.699697,0.003961,0.002771,0.0074,0.005308,0.004018,0.01073,53,20%,251.8%,0.767106,0.002467,0.001892,0.004765,0.003306,0.002743,0.006909
+54,25.1%,267.3%,0.704264,0.004371,0.003078,0.008228,0.005857,0.004463,0.011931,54,19.1%,254.8%,0.771803,0.002681,0.002069,0.005272,0.003593,0.003,0.007644
+55,24.5%,267.6%,0.708908,0.004821,0.003418,0.009146,0.00646,0.004956,0.013262,55,18.2%,258.1%,0.776553,0.002909,0.002259,0.00583,0.003898,0.003276,0.008454
+56,23.8%,267.9%,0.714489,0.005311,0.003795,0.010166,0.007117,0.005503,0.014741,56,17.2%,261.6%,0.782502,0.003155,0.002469,0.006458,0.004228,0.00358,0.009364
+57,22.9%,268.2%,0.721929,0.005844,0.004219,0.011315,0.007831,0.006118,0.016407,57,16.3%,265.2%,0.787851,0.003422,0.002696,0.00715,0.004585,0.003909,0.010368
+58,21.9%,268.6%,0.730335,0.006421,0.004689,0.012596,0.008604,0.006799,0.018264,58,15.3%,268.8%,0.794746,0.003712,0.00295,0.00793,0.004974,0.004278,0.011499
+59,20.7%,269%,0.740834,0.007055,0.005227,0.01406,0.009454,0.007579,0.020387,59,14.2%,272.4%,0.803337,0.004031,0.003238,0.008821,0.005402,0.004695,0.01279
+60,19.4%,269.2%,0.752871,0.007764,0.005845,0.015736,0.010404,0.008475,0.022817,60,13.1%,275.7%,0.812898,0.004391,0.003569,0.009841,0.005884,0.005175,0.014269
+61,18.1%,269.3%,0.765443,0.008585,0.006571,0.017697,0.011504,0.009528,0.025661,61,12.1%,278.8%,0.822133,0.004813,0.003957,0.011032,0.006449,0.005738,0.015996
+62,16.9%,269.1%,0.777739,0.009566,0.00744,0.020021,0.012818,0.010788,0.02903,62,11.1%,281.5%,0.832317,0.005318,0.004426,0.01246,0.007126,0.006418,0.018067
+63,15.9%,268.6%,0.788598,0.010768,0.008492,0.022809,0.014429,0.012313,0.033073,63,10.2%,283.6%,0.842267,0.005922,0.004988,0.014146,0.007935,0.007233,0.020512
+64,15.1%,267.5%,0.798132,0.01225,0.009777,0.026154,0.016415,0.014177,0.037923,64,9.5%,285.2%,0.850384,0.00664,0.005647,0.016104,0.008898,0.008188,0.023351
+65,14.3%,266%,0.808159,0.014054,0.011358,0.030212,0.018832,0.016469,0.043807,65,8.8%,286%,0.859343,0.007481,0.006429,0.018386,0.010025,0.009322,0.02666
+66,13.7%,263.9%,0.816631,0.016197,0.013227,0.034906,0.021704,0.019179,0.050614,66,8.2%,286.1%,0.867602,0.00845,0.007331,0.020975,0.011323,0.01063,0.030414
+67,13.2%,261.1%,0.824639,0.018669,0.015395,0.040197,0.025016,0.022323,0.058286,67,7.6%,285.4%,0.876498,0.00955,0.008371,0.02389,0.012797,0.012138,0.034641
+68,12.6%,257.7%,0.834236,0.021446,0.017891,0.046105,0.028738,0.025942,0.066852,68,7.1%,283.8%,0.884566,0.010791,0.009545,0.02709,0.01446,0.01384,0.039281
+69,12.1%,253.7%,0.843187,0.024494,0.020653,0.052397,0.032822,0.029947,0.075976,69,6.6%,281.3%,0.89313,0.012188,0.010885,0.030621,0.016332,0.015783,0.0444
+70,11.6%,249.1%,0.852547,0.027775,0.023679,0.058986,0.037219,0.034335,0.08553,70,6.1%,278%,0.902055,0.013761,0.012413,0.034509,0.01844,0.017999,0.050038
+71,11%,243.9%,0.863342,0.031254,0.026983,0.065811,0.04188,0.039125,0.095426,71,5.6%,273.8%,0.911305,0.015532,0.014154,0.038755,0.020813,0.020523,0.056195
+72,10.5%,238.2%,0.873279,0.034774,0.030367,0.072335,0.046597,0.044032,0.104886,72,5.2%,268.8%,0.919307,0.017519,0.016105,0.043291,0.023475,0.023352,0.062772
+73,10%,232.1%,0.883314,0.038195,0.033738,0.078306,0.051181,0.04892,0.113544,73,4.8%,263%,0.927437,0.020175,0.018711,0.04921,0.027035,0.027035,0.071355
+74,9.5%,225.6%,0.8934,0.041873,0.037409,0.084395,0.05611,0.054243,0.122373,74,4.5%,256.4%,0.934248,0.022696,0.021204,0.054366,0.030413,0.030413,0.078831
+75,9.1%,218.8%,0.902439,0.045878,0.041402,0.090588,0.061477,0.060033,0.131353,75,4.2%,249.2%,0.941031,0.025587,0.024078,0.060003,0.034287,0.034287,0.087004
+76,8.7%,211.7%,0.911428,0.050323,0.045866,0.097098,0.067433,0.066506,0.140792,76,3.9%,241.4%,0.947736,0.028917,0.027406,0.066157,0.038749,0.038749,0.095928
+77,8.4%,204.5%,0.919304,0.055343,0.050877,0.104044,0.07416,0.073772,0.150864,77,3.6%,233.2%,0.954242,0.032789,0.031289,0.072965,0.043937,0.043937,0.105799
+78,8.1%,197.3%,0.926945,0.061049,0.056589,0.11165,0.081806,0.081806,0.161893,78,3.5%,224.5%,0.958244,0.037308,0.03575,0.080259,0.049993,0.049993,0.116376
+79,7.9%,190%,0.93362,0.067521,0.063039,0.119774,0.090478,0.090478,0.173672,79,3.3%,215.5%,0.963284,0.042555,0.040993,0.088339,0.057024,0.057024,0.128092
+80,7.7%,182.8%,0.940065,0.074822,0.070338,0.128577,0.100261,0.100261,0.186437,80,3.2%,206.3%,0.967103,0.048592,0.046993,0.096948,0.065113,0.065113,0.140575
+81,7.5%,175.8%,0.946208,0.08298,0.078516,0.138032,0.111193,0.111193,0.200146,81,3.1%,197.1%,0.970779,0.055439,0.053819,0.106077,0.074288,0.074288,0.153812
+82,7.4%,169%,0.95142,0.092002,0.087533,0.14793,0.123283,0.123283,0.214499,82,3%,187.9%,0.974308,0.063127,0.061505,0.115568,0.08459,0.08459,0.167574
+83,7.3%,162.5%,0.956366,0.101864,0.097419,0.158306,0.136498,0.136498,0.229544,83,3%,178.8%,0.976906,0.071713,0.070057,0.125262,0.096095,0.096095,0.18163
+84,7.2%,156.3%,0.961043,0.112602,0.108215,0.169141,0.150887,0.150887,0.245254,84,2.9%,169.9%,0.980132,0.081364,0.079747,0.135491,0.109028,0.109028,0.196462
+85,7.2%,150.5%,0.964916,0.124254,0.119895,0.180441,0.1665,0.1665,0.261639,85,2.9%,161.4%,0.982506,0.092247,0.090633,0.146282,0.123611,0.123611,0.212109
+86,7.2%,145%,0.968617,0.136824,0.13253,0.192169,0.183344,0.183344,0.278645,86,2.9%,153.2%,0.984806,0.104494,0.102906,0.157652,0.140022,0.140022,0.228595
+87,7.1%,140%,0.972384,0.150241,0.146092,0.204529,0.201323,0.201323,0.296567,87,2.9%,145.5%,0.986977,0.118102,0.116564,0.169601,0.158257,0.158257,0.245921
+88,7.1%,135.3%,0.97555,0.164391,0.160372,0.216983,0.220284,0.220284,0.314625,88,3%,138.3%,0.988641,0.132974,0.131464,0.181814,0.178185,0.178185,0.26363
+89,7.1%,131.1%,0.978396,0.179159,0.175288,0.229803,0.240073,0.240073,0.333214,89,3%,131.6%,0.990609,0.149007,0.147608,0.194252,0.199669,0.199669,0.281665
+90,7.1%,127.2%,0.981054,0.194445,0.190761,0.242648,0.260556,0.260556,0.35184,90,3%,125.4%,0.992438,0.166048,0.164792,0.20665,0.222504,0.222504,0.299643
+91,7.1%,123.7%,0.983451,0.210151,0.206673,0.255655,0.281602,0.281602,0.3707,91,3.1%,119.9%,0.993869,0.18392,0.182792,0.219168,0.246453,0.246453,0.317794
+92,7.1%,120.5%,0.985654,0.226178,0.222933,0.268635,0.303079,0.303079,0.389521,92,3.1%,114.9%,0.995402,0.202384,0.201453,0.23147,0.271195,0.271195,0.335632
+93,7.1%,117.7%,0.987589,0.242442,0.239433,0.281813,0.324872,0.324872,0.408629,93,3.1%,110.6%,0.996725,0.220585,0.219863,0.243168,0.295584,0.295584,0.352594
+94,7.1%,115.1%,0.989393,0.258871,0.256125,0.2948,0.346887,0.346887,0.42746,94,3.2%,106.8%,0.997829,0.23833,0.237813,0.253984,0.319362,0.319362,0.368277
+95,7.1%,112.8%,0.990994,0.275411,0.272931,0.307866,0.369051,0.369051,0.446406,95,3.2%,103.7%,0.998817,0.256299,0.255996,0.265468,0.343441,0.343441,0.384929
+96,7.1%,110.8%,0.99239,0.292019,0.289797,0.321095,0.391305,0.391305,0.465588,96,3.2%,100%,1,0.274491,0.274491,0.274491,0.367818,0.367818,0.398012
+97,7%,108.9%,0.993809,0.308909,0.306997,0.334319,0.413938,0.413938,0.484763,97,3.3%,100%,1,0.292905,0.292905,0.292905,0.392493,0.392493,0.424712
+98,7%,107.3%,0.994916,0.326353,0.324694,0.348396,0.437313,0.437313,0.505174,98,3.3%,100%,1,0.311537,0.311537,0.311537,0.41746,0.41746,0.451729
+99,6.9%,105.8%,0.996014,0.344105,0.342733,0.362612,0.461101,0.461101,0.525787,99,3.3%,100%,1,0.330385,0.330385,0.330385,0.442716,0.442716,0.479058
+100,6.8%,104.5%,0.996949,0.362167,0.361062,0.37731,0.485304,0.485304,0.5471,100,3.3%,100%,1,0.349446,0.349446,0.349446,0.468258,0.468258,0.506697
+101,6.7%,103.4%,0.997727,0.38054,0.379675,0.392584,0.509924,0.509924,0.569247,101,3.2%,100%,1,0.368713,0.368713,0.368713,0.494075,0.494075,0.534634
+102,6.6%,102.5%,0.998353,0.399222,0.398564,0.408529,0.534957,0.534957,0.592367,102,3.2%,100%,1,0.388182,0.388182,0.388182,0.520164,0.520164,0.562864
+103,6.4%,101.7%,0.998913,0.418214,0.417759,0.424861,0.560407,0.560407,0.616048,103,3.2%,100%,1,0.407846,0.407846,0.407846,0.546514,0.546514,0.591377
+104,6.2%,101.1%,0.999318,0.437511,0.437213,0.442022,0.586265,0.586265,0.640932,104,3.1%,100%,1,0.427697,0.427697,0.427697,0.573114,0.573114,0.620161
+105,6.1%,100.7%,0.999573,0.457111,0.456916,0.460114,0.612529,0.612529,0.667165,105,3%,100%,1,0.447726,0.447726,0.447726,0.599953,0.599953,0.649203
+106,5.8%,100%,1,0.477006,0.477006,0.477006,0.639188,0.639188,0.691659,106,2.9%,100%,1,0.467921,0.467921,0.467921,0.627014,0.627014,0.678485
+107,5.6%,100%,1,0.497189,0.497189,0.497189,0.666233,0.666233,0.720924,107,2.8%,100%,1,0.488271,0.488271,0.488271,0.654283,0.654283,0.707993
+108,5.3%,100%,1,0.51765,0.51765,0.51765,0.693651,0.693651,0.750593,108,2.7%,100%,1,0.508762,0.508762,0.508762,0.681741,0.681741,0.737705
+109,5%,100%,1,0.538377,0.538377,0.538377,0.721425,0.721425,0.780647,109,2.6%,100%,1,0.529376,0.529376,0.529376,0.709364,0.709364,0.767595
+110,4.7%,100%,1,0.559353,0.559353,0.559353,0.749533,0.749533,0.811062,110,2.4%,100%,1,0.550097,0.550097,0.550097,0.73713,0.73713,0.797641
+111,4.4%,100%,1,0.58056,0.58056,0.58056,0.77795,0.77795,0.841812,111,2.3%,100%,1,0.570904,0.570904,0.570904,0.765011,0.765011,0.827811
+112,4%,100%,1,0.601975,0.601975,0.601975,0.806647,0.806647,0.872864,112,2.1%,100%,1,0.591772,0.591772,0.591772,0.792974,0.792974,0.858069
+113,3.6%,100%,1,0.623571,0.623571,0.623571,0.835585,0.835585,0.904178,113,1.9%,100%,1,0.612677,0.612677,0.612677,0.820987,0.820987,0.888382
+114,3.2%,100%,1,0.645315,0.645315,0.645315,0.864722,0.864722,0.935707,114,1.7%,100%,1,0.633589,0.633589,0.633589,0.849009,0.849009,0.918704
+115,2.7%,100%,1,0.66717,0.66717,0.66717,0.894008,0.894008,0.967397,115,1.4%,100%,1,0.654476,0.654476,0.654476,0.876998,0.876998,0.94899
+116,2.2%,100%,1,0.689091,0.689091,0.689091,0.923382,0.923382,0.999182,116,1.2%,100%,1,0.675302,0.675302,0.675302,0.904905,0.904905,0.979188
+117,1.7%,100%,1,0.711028,0.711028,0.711028,0.952778,0.952778,1,117,0.9%,100%,1,0.696026,0.696026,0.696026,0.932675,0.932675,1
+118,1.2%,100%,1,0.73292,0.73292,0.73292,0.982113,0.982113,1,118,0.6%,100%,1,0.716604,0.716604,0.716604,0.960249,0.960249,1
+119,0.6%,100%,1,0.754701,0.754701,0.754701,1,1,1,119,0.3%,100%,1,0.736988,0.736988,0.736988,0.987564,0.987564,1
+120,0%,100%,1,0.776292,0.776292,0.776292,1,1,1,120,0%,100%,1,0.757123,0.757123,0.757123,1,1,1
 121,0%,100%,1,1,1,1,1,1,1,121,0%,100%,1,1,1,1,1,1,1
diff --git a/inst/extdata/ValuationTables_Austria_Annuities_AVOe2005R.R b/inst/extdata/ValuationTables_Austria_Annuities_AVOe2005R.R
index ab75b014866dd5e84a5c3579a752a6aad4d03075..3c3375b655293dd68ece4dedcb2b9ed2e7504ea2 100644
--- a/inst/extdata/ValuationTables_Austria_Annuities_AVOe2005R.R
+++ b/inst/extdata/ValuationTables_Austria_Annuities_AVOe2005R.R
@@ -65,6 +65,7 @@ AVOe2005R.av.verschiebung = utils::read.csv(
         "extdata",
         "Austria_Annuities_AVOe2005R_AVShifts.csv",
         package="ValuationTables"),
+    row.names=1,
     skip=2);
 
 AVOe2005R_gen.av = function(nm, probs, shft) {
@@ -76,6 +77,7 @@ AVOe2005R_gen.av = function(nm, probs, shft) {
     )
 }
 
+str(AVOe2005R.av.verschiebung)
 AVOe2005R.male.av = AVOe2005R_gen.av(
     "AVÖ 2005R male (age-shifted), loaded",
     "qx1965", "shiftM");
diff --git a/inst/extdata/ValuationTables_Germany_Annuities.R b/inst/extdata/ValuationTables_Germany_Annuities.R
new file mode 100644
index 0000000000000000000000000000000000000000..5a5519dc712ca62ee114c1d08ff0188212f0bb16
--- /dev/null
+++ b/inst/extdata/ValuationTables_Germany_Annuities.R
@@ -0,0 +1,3 @@
+stopifnot(require(methods), require(utils), require(ValuationTables))
+
+valuationTables.load("Germany_Annuities_*", wildcard = TRUE)
diff --git a/inst/extdata/ValuationTables_Germany_Annuities_DAV1994R.R b/inst/extdata/ValuationTables_Germany_Annuities_DAV1994R.R
new file mode 100644
index 0000000000000000000000000000000000000000..20373d769221a478be4e74e83f679a11f038e3ba
--- /dev/null
+++ b/inst/extdata/ValuationTables_Germany_Annuities_DAV1994R.R
@@ -0,0 +1,63 @@
+stopifnot(require(methods), require(utils), require(ValuationTables))
+
+###############################################################################
+# DAV 1994R exact (Male, Female), 1st-order only
+###############################################################################
+
+
+DAV1994R.exakt.data = utils::read.csv(
+    system.file("extdata",
+                "Germany_Annuities_DAV1994R.csv",
+                package = "ValuationTables"),
+    col.names = c("age",
+                  "qx2000", "qy2000",
+                  "trendM", "trendF",
+                  "qxAVbase1955", "qyAVbase1955",
+                  "", "", "", "", "", "", ""),
+    row.names = NULL,
+    skip = 2)
+
+DAV1994R.av.data = utils::read.csv(
+    system.file("extdata",
+                "Germany_Annuities_DAV1994R_AV.csv",
+                package = "ValuationTables"),
+    row.names = 1,
+    skip = 4
+)
+
+DAV1994R.male = valuationTable.trendProjection(
+    name = "DAV 1994R male",
+    ages = DAV1994R.exakt.data$age,
+    baseYear = 2000,
+    deathProbs = DAV1994R.exakt.data$qx2000,
+    trend = DAV1994R.exakt.data$trendM
+);
+
+DAV1994R.female = valuationTable.trendProjection(
+    name = "DAV 1994R female",
+    ages = DAV1994R.exakt.data$age,
+    baseYear = 2000,
+    deathProbs = DAV1994R.exakt.data$qxAVbase1955,
+    trend = DAV1994R.exakt.data$trendF
+);
+
+
+
+DAV1994R.male.av = valuationTable.ageShift(
+    name = "DAV 1994R male, age-shifted",
+    ages = DAV1994R.exakt.data$age,
+    deathProbs = DAV1994R.exakt.data$qxAVbase1955,
+    ageShifts = DAV1994R.av.data["AS.Male"]
+);
+
+DAV1994R.female.av = valuationTable.ageShift(
+    name = "DAV 1994R female, age-shifted",
+    ages = DAV1994R.exakt.data$age,
+    deathProbs = DAV1994R.exakt.data$qyAVbase1955,
+    ageShifts = DAV1994R.av.data["AS.Female"]
+);
+
+
+rm(DAV1994R.exakt.data, DAV1994R.av.data)
+
+# plotValuationTables(DAV1994R.male, DAV1994R.male.av, DAV1994T.male, DAV1994T.male.2Ord, DAV2008T.male)
diff --git a/inst/extdata/ValuationTables_Germany_Annuities_DAV2004R.R b/inst/extdata/ValuationTables_Germany_Annuities_DAV2004R.R
new file mode 100644
index 0000000000000000000000000000000000000000..386778439c70f8a7937829c0d6070f28883585a9
--- /dev/null
+++ b/inst/extdata/ValuationTables_Germany_Annuities_DAV2004R.R
@@ -0,0 +1,136 @@
+stopifnot(require(methods), require(utils), require(ValuationTables))
+
+
+###############################################################################
+# DAV 2004R exact (Male, Female)
+###############################################################################
+
+DAV2004R.data.basistafeln = utils::read.csv(
+    system.file("extdata",
+                "Germany_Annuities_DAV2004R.csv",
+                package = "ValuationTables"),
+    col.names = c("age",
+                  "qxSel2Ord", "qySel2Ord", "qxAgg2Ord", "qyAgg2Ord",
+                  "qxSelBestand", "qySelBestand", "qxAggBestand", "qyAggBestand",
+                  "qxSel", "qySel", "qxAgg", "qyAgg"),
+    row.names = NULL,
+    skip = 3)
+
+
+DAV2004R.data.trend = utils::read.csv(
+    system.file("extdata",
+                "Germany_Annuities_DAV2004R_Trends.csv",
+                package = "ValuationTables"),
+    col.names = c("age",
+                  "trend2Ord.male.start", "trend2Ord.female.start",
+                  "trend2Ord.male.end", "trend2Ord.female.end",
+                  "trendBestand.male.start", "trendBestand.female.start",
+                  "trendBestand.male.end", "trendBestand.female.end",
+                  "trend1Ord.male", "trend1Ord.female"),
+    row.names = NULL,
+    skip = 3)
+
+
+DAV2004R.data.select = utils::read.csv(
+    system.file("extdata",
+                "Germany_Annuities_DAV2004R_Select.csv",
+                package = "ValuationTables"),
+    col.names = c("year", "SelectMale", "SelectFemale"),
+    row.names = NULL,
+    skip = 2)
+
+
+DAV2004R.data.av.grundtafeln = utils::read.csv(
+    system.file("extdata",
+                "Germany_Annuities_DAV2004R_AVBase.csv",
+                package = "ValuationTables"),
+    col.names = c("age",
+                  "qxBestand", "qyBestand",
+                  "qxB20", "qyB20",
+                  "qx1Ord", "qy1Ord"),
+    row.names = NULL,
+    skip = 2)
+
+
+DAV2004R.data.av = utils::read.csv(
+    system.file("extdata",
+                "Germany_Annuities_DAV2004R_AV.csv",
+                package = "ValuationTables"),
+    col.names = c("YOB", "shiftMBestand", "shiftFBestand",
+                  "shiftMB20", "shiftFB20",
+                  "shiftM1Ord", "shiftF1Ord"),
+    row.names = 1,
+    skip = 1)
+
+
+# colnames(DAV2004R.data.basistafeln)
+# colnames(DAV2004R.data.trend)
+
+DAV2004R.male = valuationTable.trendProjection(
+    name = "DAV 2004R male, aggregate, loaded",
+    ages = DAV2004R.data.basistafeln$age,
+    baseYear = 1999,
+    deathProbs = DAV2004R.data.basistafeln$qxAgg,
+    trend = DAV2004R.data.trend$trend1Ord.male
+);
+
+DAV2004R.female = valuationTable.trendProjection(
+    name = "DAV 2004R female, aggregate, loaded",
+    ages = DAV2004R.data.basistafeln$age,
+    baseYear = 1999,
+    deathProbs = DAV2004R.data.basistafeln$qyAgg,
+    trend = DAV2004R.data.trend$trend1Ord.female
+)
+
+
+DAV2004R.male.2Ord = valuationTable.trendProjection(
+    name = "DAV 2004R male, aggregate, unloaded, no trend dampening",
+    ages = DAV2004R.data.basistafeln$age,
+    baseYear = 1999,
+    deathProbs = DAV2004R.data.basistafeln$qxAgg,
+    trend = DAV2004R.data.trend$trend2Ord.male.start
+);
+
+DAV2004R.female.2Ord = valuationTable.trendProjection(
+    name = "DAV 2004R female, aggregate, unloaded, no trend dampening",
+    ages = DAV2004R.data.basistafeln$age,
+    baseYear = 1999,
+    deathProbs = DAV2004R.data.basistafeln$qyAgg,
+    trend = DAV2004R.data.trend$trend2Ord.female.start
+)
+
+
+
+DAV2004R.male.av = valuationTable.ageShift(
+    name = "DAV 2004R male, age-shifted, aggregate, loaded",
+    ages = DAV2004R.data.av.grundtafeln$age,
+    deathProbs = DAV2004R.data.av.grundtafeln$qx1Ord,
+    ageShifts = DAV2004R.data.av["shiftM1Ord"]
+);
+DAV2004R.female.av = valuationTable.ageShift(
+    name = "DAV 2004R female, age-shifted, aggregate, loaded",
+    ages = DAV2004R.data.av.grundtafeln$age,
+    deathProbs = DAV2004R.data.av.grundtafeln$qy1Ord,
+    ageShifts = DAV2004R.data.av["shiftF1Ord"]
+)
+
+DAV2004R.male.av.2Ord = valuationTable.ageShift(
+    name = "DAV 2004R male, age-shifted, aggregate, unloaded, no trend dampening",
+    ages = DAV2004R.data.av.grundtafeln$age,
+    deathProbs = DAV2004R.data.av.grundtafeln$qxBestand,
+    ageShifts = DAV2004R.data.av["shiftMBestand"]
+);
+DAV2004R.female.av.2Ord = valuationTable.ageShift(
+    name = "DAV 2004R female, age-shifted, aggregate, unloaded, no trend dampening",
+    ages = DAV2004R.data.av.grundtafeln$age,
+    deathProbs = DAV2004R.data.av.grundtafeln$qyBestand,
+    ageShifts = DAV2004R.data.av["shiftFBestand"]
+)
+
+
+rm(DAV2004R.data.basistafeln,
+   DAV2004R.data.trend,
+   DAV2004R.data.select,
+   DAV2004R.data.av.grundtafeln,
+   DAV2004R.data.av)
+
diff --git a/inst/extdata/ValuationTables_Germany_Endowments_DAV2008T.R b/inst/extdata/ValuationTables_Germany_Endowments_DAV2008T.R
index d9d9c7196c177ae5cfa7e92707dd11a8a12644ae..e7ca58e29387e7809497c74158c4f47c3485c07d 100644
--- a/inst/extdata/ValuationTables_Germany_Endowments_DAV2008T.R
+++ b/inst/extdata/ValuationTables_Germany_Endowments_DAV2008T.R
@@ -31,8 +31,7 @@ DAV2008T.data = utils::read.csv(
                   "", "", "", "",
                   "qy2", "qy2NR", "qy2R",  # female 2nd order
                   "qy1", "qy1NR", "qy1R"), # female 1st order
-    skip = 1);
-
+    skip = 4);
 
 ### DAV 2008T Aggregat (smoker+non-smoker combined)
 DAV2008T.male = valuationTable.period(
@@ -100,3 +99,11 @@ DAV2008T.female.nonsmoker.2Ord = valuationTable.period(
   deathProbs = DAV2008T.data$qy2NR)
 
 rm(DAV2008T.data)
+
+
+# plotValuationTables(DAV1994T.male, DAV2008T.male, DAV2008T.male.smoker, DAV2008T.male.nonsmoker, DAV2008T.male.2Ord, DAV2008T.male.smoker.2Ord, DAV2008T.male.nonsmoker.2Ord, legend.position = c(1, 0), title = "DAV 2008T Vergleich Raucher-Nichtraucher")
+#
+# plotValuationTables(DAV1994T.male, DAV2008T.male.2Ord, DAV2008T.male.smoker.2Ord, DAV2008T.male.nonsmoker.2Ord, legend.position = c(1, 0), title = "DAV 2008T Vergleich Raucher-Nichtraucher")
+#
+# plotValuationTableComparisons(DAV1994T.male, DAV2008T.male.2Ord, DAV2008T.male.smoker.2Ord, DAV2008T.male.nonsmoker.2Ord, legend.position = c(1, 0), title = "DAV 2008T Vergleich Raucher-Nichtraucher", reference = DAV2008T.male.2Ord, ylim=c(.5,2))
+
diff --git a/man/ages.Rd b/man/ages.Rd
index 3843939cf255244a8aa8111d5f07aa73e477663e..7c2975eb069a9c5692e8aca719811b16fc5136f2 100644
--- a/man/ages.Rd
+++ b/man/ages.Rd
@@ -3,6 +3,8 @@
 \docType{methods}
 \name{ages}
 \alias{ages}
+\alias{ages,valuationTable.joined-method}
+\alias{ages,valuationTable.mixed-method}
 \alias{ages,valuationTable.observed-method}
 \alias{ages,valuationTable.period-method}
 \title{Return the defined ages of the life table}
@@ -11,6 +13,10 @@ ages(object, ...)
 
 \S4method{ages}{valuationTable.period}(object, ...)
 
+\S4method{ages}{valuationTable.mixed}(object, ...)
+
+\S4method{ages}{valuationTable.joined}(object, ...)
+
 \S4method{ages}{valuationTable.observed}(object, ...)
 }
 \arguments{
@@ -23,8 +29,12 @@ Return the defined ages of the life table
 }
 \section{Methods (by class)}{
 \itemize{
-\item \code{valuationTable.period}: Return the defined ages of the life table
+\item \code{valuationTable.period}: Return the defined ages of the period life table
+
+\item \code{valuationTable.mixed}: Return the defined ages of the mixed life table
+
+\item \code{valuationTable.joined}: Return the defined ages of the joined life table
 
-\item \code{valuationTable.observed}: Return the defined ages of the life table
+\item \code{valuationTable.observed}: Return the defined ages of the observed life table
 }}
 
diff --git a/man/valuationTables.list.Rd b/man/valuationTables.list.Rd
index 0e78c33c9b73fc3563a84db248711f99ea428849..922b2c3da67bfe2eae82ba91896e04debfe47c64 100644
--- a/man/valuationTables.list.Rd
+++ b/man/valuationTables.list.Rd
@@ -5,7 +5,10 @@
 \title{List all available sets of life tables provided by the \link[ValuationTables]{ValuationTables-package} package
 An existing life table can then be loaded with \link{valuationTables.load}.}
 \usage{
-valuationTables.list()
+valuationTables.list(pattern = "*")
+}
+\arguments{
+\item{pattern}{Restrict the results only to life table sets that match the pattern (default: "*" to show all sets)}
 }
 \description{
 List all available sets of life tables provided by the \link[ValuationTables]{ValuationTables-package} package
diff --git a/man/valuationTables.load.Rd b/man/valuationTables.load.Rd
index 4c17dd771e76e3781c91fd5c418fa3ced600f86f..e9aaea8bc6076f325e4928f32cd30f1da07dc955 100644
--- a/man/valuationTables.load.Rd
+++ b/man/valuationTables.load.Rd
@@ -4,10 +4,14 @@
 \alias{valuationTables.load}
 \title{Load a named set of life tables provided by the \link{ValuationTables} package}
 \usage{
-valuationTables.load(dataset)
+valuationTables.load(dataset, wildcard = FALSE)
 }
 \arguments{
-\item{dataset}{The set of life tables to be loaded. A list of all available data sets is provided by the}
+\item{dataset}{The set of life tables to be loaded. A list of all available
+data sets is provided by the}
+
+\item{wildcard}{Whether the dataset name contains wildcard. If TRUE, all
+datasets matching the pattern will be loaded}
 }
 \description{
 Load a named set of life tables provided by the \link{ValuationTables} package
diff --git a/src/Tables/DAV_2004_R.xls b/src/Tables/DAV_2004_R.xls
deleted file mode 100644
index 8e9190957e4f858e9ba4de2fab5660fe6d420526..0000000000000000000000000000000000000000
Binary files a/src/Tables/DAV_2004_R.xls and /dev/null differ
diff --git a/src/Tables/DAV_R.xls b/src/Tables/DAV_R.xls
deleted file mode 100644
index 35c58a73cbc6f062c815a2c0faea2f4334a2de24..0000000000000000000000000000000000000000
Binary files a/src/Tables/DAV_R.xls and /dev/null differ