Start implementing AFT compatibility