Refactored VM state