AFP flow management

AFP flow management