removed duplicate spec
extracted out metadata value types