Added metatdata to more entities.
Fix in vm metadata.
Merge branch 'test' into dev