Add omitempty option to some fields