Add #5: Support for optional v. required fields