Add MAF calculations