Added step-selectors