Better support for different variations of vm definitions