Moved KeyValue tagging to Shared Services