Update to support Vagrant