Add more validations