Fixes #4242: update node configuration model and storage to improve performance