REDCORE-230 Updating the Step Classes