Further changes for VM