[Retrieve Metadata] Address Simon's comments