Add validation for state. Update version