[Addresses #65246866]Add system_or_record to Company