Add exclude/override model option to PopFields config, add type_id field