First version of ndf content handling