Initial add with NFS changes