#91: Metadata handling clarification