Reorganization of the helper functions and node configuration'