Add validation to each step