F-NaF Security Overhaul