Added a new set of AF and updated the AF base class