Add validation for mandatory fields