Improve validations