Improved AFC API