Update .vm to match refactoring