Adding shard_spaces creation & update support