Adding optional steps.