ELEN-19 - Modified the KeyValueStore to handle wildcards