fixed KeyValue  import, changed to namespaces