Support the extra_fields stuff
Need this now