Switched list to dict for object-on-object storage