Add nodes flow rework

Please review