AddNode: move the initial setup to boostrap