Handle our custom fields automatically
addressing comments from code review