Rework of store and node base