Changes to support nfo files