fix: Validators for mandatory fields