added back hasmetric and hasvalue properties in vocabulary