Adding Validation Changes