Add name fields. Add generation of multiple identifiers per company.