Added conditionally required fields