Add NFS and tweaks for composer