Fixed VM macros references
Changed builder property with correct implementation class name