Switch out KVService to standard DataService