Add VMS updates and improvements
