GH54 - Replace the simple form with an wizzard, and add first node
expand property