Make query/store metadata completely duck typed