Clarify IDs, avoid mandating a specific storage format