adapted StorageLayer for multiple basedOn keys