Added tracking functionality and StepperController