Add order to steps and set when creating