Slight update to metadata use