Change validation criteria and add public validation function