Enhanced NFO scanning