StoreServer improvements