Changed handling of metadata.