Updated support for AFAS