Performance improvements to StartNode