Address Chris' comments regarding metadata