Improved vagrant handler