Metadata improvments