improve Vagrant implementation