Add more validation functions
Update version