More work to introduce step invoker