Refector some steps/fields api in order to make easier reorder things clientside