Better validation
Minor updates
Minor updates
Minor updates