Added KeyValueStore to replace GlobalSettings