updated to support new types for measurement kinds