Feature/kvstore namespace

Modified kv store to prefix with delivery class