Added MAF functionality option