Optimization: make less validations