Add Stop & Step and change data source feature