Added KeyValueStorage in Core