Metadata should work properly without creating duplicates now