changed namespace to MAF