Update for better use with Vagrant