Add missing custom attributes
Rename and flesh out MetadataStore
Add missing type check tests