Added Validation to Then Steps