Fixed metadata import