VM support enhancements