More alignment logic for metadata retrieval