prepare to refactor node state store down to storemate level