NAF branch updated to meet the NAF specifications