Add NFS and agent_forwarding