Refactored to differentiate identities from values on the storage side