Address Chris' concerns regarding metadata