Merge "Storage methods using IDs, update listeners."