Fixed AF namespace conflicting
Update interface