kvs_feed refactored