moving storage logic to separate node module