Replaced SPXStore with SPXKeyValueStore