Add validations
Add more validations