Improve StepGear
Introduce Dependency