Refactoring. Change event model for steps.