API work in progress for AFN 2.0 port