Changes to work with (incomplete) refactored version of StoreClient, with incmrenetal PUTs