Basic support for new (correct :)) way to drive the setup