Improve vagrant support