If the id is still in the key, do we need it in the value as well?