Initial support for multiple steps with CommandController