Fixed MAF calculations; added Storage Time class