Allow two optional fields to be optional