Add some more NF requirements