Minor adjustments
Minor maintenance
Small Validations Change