Added the KeyValue SQL and modified schema to have display name in target and target value