Chore/validations