Updated MTAFCore to reflect MTAFBy