Allow additional start nodes

Squash commit of #928