diff --git a/api/research/research_models/company_product.go b/api/research/research_models/company_product.go
index c36a441..8cedf59 100644
--- a/api/research/research_models/company_product.go
+++ b/api/research/research_models/company_product.go
@@ -20,7 +20,7 @@ import (
 
 // CompanyProduct A software product or service vended by a Company
 //
-// swagger:model CompanyProduct
+// swagger:model companyProduct
 type CompanyProduct struct {
 
 	// Account Email
diff --git a/api/research/research_models/company_service.go b/api/research/research_models/company_service.go
index ead8050..955fb7b 100644
--- a/api/research/research_models/company_service.go
+++ b/api/research/research_models/company_service.go
@@ -20,7 +20,7 @@ import (
 
 // CompanyService A service performed by a Company
 //
-// swagger:model CompanyService
+// swagger:model companyService
 type CompanyService struct {
 
 	// Account Email
diff --git a/api/research/research_models/factor.go b/api/research/research_models/factor.go
index d3ab8a4..6862d37 100644
--- a/api/research/research_models/factor.go
+++ b/api/research/research_models/factor.go
@@ -20,7 +20,7 @@ import (
 
 // Factor A Factor of analysis within a research topic
 //
-// swagger:model Factor
+// swagger:model factor
 type Factor struct {
 
 	// Created By User ID
diff --git a/api/research/research_models/financial_statement.go b/api/research/research_models/financial_statement.go
index af8bafb..ca664ab 100644
--- a/api/research/research_models/financial_statement.go
+++ b/api/research/research_models/financial_statement.go
@@ -18,7 +18,7 @@ import (
 
 // FinancialStatement A financial statement for a company
 //
-// swagger:model FinancialStatement
+// swagger:model financialStatement
 type FinancialStatement struct {
 
 	// EDGAR Access Number
diff --git a/api/research/research_models/industry.go b/api/research/research_models/industry.go
index a6d4542..6608870 100644
--- a/api/research/research_models/industry.go
+++ b/api/research/research_models/industry.go
@@ -20,7 +20,7 @@ import (
 
 // Industry An industry that is being researched
 //
-// swagger:model Industry
+// swagger:model industry
 type Industry struct {
 
 	// The list of Products in this industry
diff --git a/api/research/research_models/industry_company.go b/api/research/research_models/industry_company.go
index 22664db..54106d2 100644
--- a/api/research/research_models/industry_company.go
+++ b/api/research/research_models/industry_company.go
@@ -16,14 +16,23 @@ import (
 	"github.com/go-openapi/swag"
 )
 
-// IndustryCompany Junction object between Industry and Company
+// IndustryCompany Junction object between Industry and Company (Account)
 //
-// swagger:model IndustryCompany
+// swagger:model industryCompany
 type IndustryCompany struct {
 
 	// company ID
 	CompanyID *string `json:"CompanyID,omitempty"`
 
+	// company name
+	CompanyName *string `json:"CompanyName,omitempty"`
+
+	// company slug
+	CompanySlug *string `json:"CompanySlug,omitempty"`
+
+	// company tag line
+	CompanyTagLine *string `json:"CompanyTagLine,omitempty"`
+
 	// Created By User ID
 	CreatedByID *string `json:"CreatedByID,omitempty"`
 
@@ -36,6 +45,15 @@ type IndustryCompany struct {
 	// industry ID
 	IndustryID *string `json:"IndustryID,omitempty"`
 
+	// industry name
+	IndustryName *string `json:"IndustryName,omitempty"`
+
+	// industry slug
+	IndustrySlug *string `json:"IndustrySlug,omitempty"`
+
+	// industry tag line
+	IndustryTagLine *string `json:"IndustryTagLine,omitempty"`
+
 	// Last Modified By User ID
 	LastModifiedByID *string `json:"LastModifiedByID,omitempty"`
 
diff --git a/api/research/research_models/industry_product.go b/api/research/research_models/industry_product.go
index 31337be..a2e61c8 100644
--- a/api/research/research_models/industry_product.go
+++ b/api/research/research_models/industry_product.go
@@ -18,7 +18,7 @@ import (
 
 // IndustryProduct Junction object between Industry and CompanyProduct
 //
-// swagger:model IndustryProduct
+// swagger:model industryProduct
 type IndustryProduct struct {
 
 	// company product ID
diff --git a/api/research/research_models/industry_service.go b/api/research/research_models/industry_service.go
index 127b443..b4234d6 100644
--- a/api/research/research_models/industry_service.go
+++ b/api/research/research_models/industry_service.go
@@ -19,7 +19,7 @@ import (
 
 // IndustryService Junction Object bewtwen Industry and CompanyService
 //
-// swagger:model IndustryService
+// swagger:model industryService
 type IndustryService struct {
 
 	// company service
diff --git a/api/research/research_models/observation.go b/api/research/research_models/observation.go
index 1dd88bd..16a32dc 100644
--- a/api/research/research_models/observation.go
+++ b/api/research/research_models/observation.go
@@ -18,7 +18,7 @@ import (
 
 // Observation A data point collected while analyzing a Factor
 //
-// swagger:model Observation
+// swagger:model observation
 type Observation struct {
 
 	// The ID of the Company being analyzed
diff --git a/api/research/research_models/topic.go b/api/research/research_models/topic.go
index c15e357..439de83 100644
--- a/api/research/research_models/topic.go
+++ b/api/research/research_models/topic.go
@@ -20,7 +20,7 @@ import (
 
 // Topic A research topic that collects data
 //
-// swagger:model Topic
+// swagger:model topic
 type Topic struct {
 
 	// Created By User ID
diff --git a/api/sfgate/sfgate_models/industry.go b/api/sfgate/sfgate_models/industry.go
index a51fb5a..ed1a85e 100644
--- a/api/sfgate/sfgate_models/industry.go
+++ b/api/sfgate/sfgate_models/industry.go
@@ -235,8 +235,29 @@ func (m *Industry) UnmarshalBinary(b []byte) error {
 // swagger:model IndustryCompanyProductsItems0
 type IndustryCompanyProductsItems0 struct {
 
+	// Account Email
+	AccountEmail *string `json:"AccountEmail,omitempty"`
+
 	// ID of the Company that owns this Product
-	AccountID string `json:"AccountID,omitempty"`
+	AccountID *string `json:"AccountID,omitempty"`
+
+	// Account Logo
+	AccountLogo *string `json:"AccountLogo,omitempty"`
+
+	// Account Name
+	AccountName *string `json:"AccountName,omitempty"`
+
+	// Account Number
+	AccountNumber *string `json:"AccountNumber,omitempty"`
+
+	// Account Publish
+	AccountPublish *bool `json:"AccountPublish,omitempty"`
+
+	// Account Slug
+	AccountSlug *string `json:"AccountSlug,omitempty"`
+
+	// Account Website
+	AccountWebsite *string `json:"AccountWebsite,omitempty"`
 
 	// Salesforce AppExchange URL
 	AppExchange *string `json:"AppExchange,omitempty"`
@@ -271,7 +292,7 @@ type IndustryCompanyProductsItems0 struct {
 	// Last Enriched By User ID
 	LastEnrichedByID *string `json:"LastEnrichedByID,omitempty"`
 
-	// Last Enrichment Date
+	// Last Enriched Date
 	LastEnrichmentDate *string `json:"LastEnrichmentDate,omitempty"`
 
 	// Last Modified By User ID
@@ -402,9 +423,30 @@ func (m *IndustryCompanyProductsItems0) UnmarshalBinary(b []byte) error {
 // swagger:model IndustryCompanyServicesItems0
 type IndustryCompanyServicesItems0 struct {
 
+	// Account Email
+	AccountEmail *string `json:"AccountEmail,omitempty"`
+
 	// ID of the Company that owns this Service
 	AccountID string `json:"AccountID,omitempty"`
 
+	// Account Logo
+	AccountLogo *string `json:"AccountLogo,omitempty"`
+
+	// Account Name
+	AccountName *string `json:"AccountName,omitempty"`
+
+	// Account Number
+	AccountNumber *string `json:"AccountNumber,omitempty"`
+
+	// Account Publish
+	AccountPublish *bool `json:"AccountPublish,omitempty"`
+
+	// Account Slug
+	AccountSlug *string `json:"AccountSlug,omitempty"`
+
+	// Account Website
+	AccountWebsite *string `json:"AccountWebsite,omitempty"`
+
 	// Salesforce AppExchange URL
 	AppExchange *string `json:"AppExchange,omitempty"`
 
@@ -432,10 +474,13 @@ type IndustryCompanyServicesItems0 struct {
 	// Image URL
 	ImageURL *string `json:"ImageURL,omitempty"`
 
+	// Industries
+	Industries []*Industry `json:"Industries"`
+
 	// Last Enriched By User ID
 	LastEnrichedByID *string `json:"LastEnrichedByID,omitempty"`
 
-	// Last Enrichment Date
+	// Last Enriched Date
 	LastEnrichmentDate *string `json:"LastEnrichmentDate,omitempty"`
 
 	// Last Modified By User ID
@@ -471,11 +516,75 @@ type IndustryCompanyServicesItems0 struct {
 
 // Validate validates this industry company services items0
 func (m *IndustryCompanyServicesItems0) Validate(formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.validateIndustries(formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
 	return nil
 }
 
-// ContextValidate validates this industry company services items0 based on context it is used
+func (m *IndustryCompanyServicesItems0) validateIndustries(formats strfmt.Registry) error {
+	if swag.IsZero(m.Industries) { // not required
+		return nil
+	}
+
+	for i := 0; i < len(m.Industries); i++ {
+		if swag.IsZero(m.Industries[i]) { // not required
+			continue
+		}
+
+		if m.Industries[i] != nil {
+			if err := m.Industries[i].Validate(formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("Industries" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("Industries" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
+	return nil
+}
+
+// ContextValidate validate this industry company services items0 based on the context it is used
 func (m *IndustryCompanyServicesItems0) ContextValidate(ctx context.Context, formats strfmt.Registry) error {
+	var res []error
+
+	if err := m.contextValidateIndustries(ctx, formats); err != nil {
+		res = append(res, err)
+	}
+
+	if len(res) > 0 {
+		return errors.CompositeValidationError(res...)
+	}
+	return nil
+}
+
+func (m *IndustryCompanyServicesItems0) contextValidateIndustries(ctx context.Context, formats strfmt.Registry) error {
+
+	for i := 0; i < len(m.Industries); i++ {
+
+		if m.Industries[i] != nil {
+			if err := m.Industries[i].ContextValidate(ctx, formats); err != nil {
+				if ve, ok := err.(*errors.Validation); ok {
+					return ve.ValidateName("Industries" + "." + strconv.Itoa(i))
+				} else if ce, ok := err.(*errors.CompositeError); ok {
+					return ce.ValidateName("Industries" + "." + strconv.Itoa(i))
+				}
+				return err
+			}
+		}
+
+	}
+
 	return nil
 }
 
diff --git a/swagger/defs/company-product.yaml b/swagger/defs/company-product.yaml
index 9415e50..6747a71 100644
--- a/swagger/defs/company-product.yaml
+++ b/swagger/defs/company-product.yaml
@@ -1,12 +1,38 @@
 CompanyProduct:
   description: A software product or service vended by a Company
   properties:
-    ID:
-      description: Record Id
-      type: string
     AccountID:
       description: ID of the Company that owns this Product
       type: string
+      x-nullable: true
+    AccountNumber:
+      description: Account Number
+      type: string
+      x-nullable: true
+    AccountName:
+      description: Account Name
+      type: string
+      x-nullable: true
+    AccountPublish:
+      description: Account Publish
+      type: boolean
+      x-nullable: true
+    AccountWebsite:
+      description: Account Website
+      type: string
+      x-nullable: true
+    AccountEmail:
+      description: Account Email
+      type: string
+      x-nullable: true
+    AccountLogo:
+      description: Account Logo
+      type: string
+      x-nullable: true
+    AccountSlug:
+      description: Account Slug
+      type: string
+      x-nullable: true
     AppExchange:
       description: Salesforce AppExchange URL
       type: string
@@ -31,6 +57,9 @@ CompanyProduct:
       description: Full Description of product
       type: string
       x-nullable: true
+    ID:
+      description: Record Id
+      type: string
     ImageAltText:
       description: Image Alt Text
       type: string
@@ -39,12 +68,18 @@ CompanyProduct:
       description: Image URL
       type: string
       x-nullable: true
+    Industries:
+      description: Industries
+      items:
+        $ref: "./industry.yaml#/Industry"
+      type: array
+      x-nullable: true
     LastEnrichedByID:
       description: Last Enriched By User ID
       type: string
       x-nullable: true
     LastEnrichmentDate:
-      description: Last Enrichment Date
+      description: Last Enriched Date
       type: string
       x-nullable: true
     LastModifiedByID:
@@ -87,10 +122,4 @@ CompanyProduct:
       description: Website
       type: string
       x-nullable: true
-    Industries:
-      description: Industries
-      items:
-        $ref: "./industry.yaml#/Industry"
-      type: array
-      x-nullable: true
   type: object
diff --git a/swagger/defs/company-service.yaml b/swagger/defs/company-service.yaml
index dd39f25..fd290c9 100644
--- a/swagger/defs/company-service.yaml
+++ b/swagger/defs/company-service.yaml
@@ -7,6 +7,34 @@ CompanyService:
     AccountID:
       description: ID of the Company that owns this Service
       type: string
+    AccountNumber:
+      description: Account Number
+      type: string
+      x-nullable: true
+    AccountName:
+      description: Account Name
+      type: string
+      x-nullable: true
+    AccountPublish:
+      description: Account Publish
+      type: boolean
+      x-nullable: true
+    AccountWebsite:
+      description: Account Website
+      type: string
+      x-nullable: true
+    AccountEmail:
+      description: Account Email
+      type: string
+      x-nullable: true
+    AccountLogo:
+      description: Account Logo
+      type: string
+      x-nullable: true
+    AccountSlug:
+      description: Account Slug
+      type: string
+      x-nullable: true
     AppExchange:
       description: Salesforce AppExchange URL
       type: string
@@ -39,12 +67,18 @@ CompanyService:
       description: Image URL
       type: string
       x-nullable: true
+    Industries:
+      description: Industries
+      items:
+        $ref: "./industry.yaml#/Industry"
+      type: array
+      x-nullable: true
     LastEnrichedByID:
       description: Last Enriched By User ID
       type: string
       x-nullable: true
     LastEnrichmentDate:
-      description: Last Enrichment Date
+      description: Last Enriched Date
       type: string
       x-nullable: true
     LastModifiedByID:
diff --git a/swagger/defs/factor.yaml b/swagger/defs/factor.yaml
index a7ca5a7..fae3921 100644
--- a/swagger/defs/factor.yaml
+++ b/swagger/defs/factor.yaml
@@ -1,9 +1,6 @@
 Factor:
   description: A Factor of analysis within a research topic
   properties:
-    ID:
-      description: Record Id
-      type: string
     CreatedByID:
       description: Created By User ID
       type: string
@@ -16,6 +13,9 @@ Factor:
       description: Topic Description
       type: string
       x-nullable: true
+    ID:
+      description: Record Id
+      type: string
     LastModifiedByID:
       description: Last Modified By User ID
       type: string
@@ -23,6 +23,7 @@ Factor:
     LastModifiedDate:
       description: Last Modified Date
       type: string
+      x-nullable: true
     Name:
       description: Factor Name
       type: string
diff --git a/swagger/defs/financial-statement.yaml b/swagger/defs/financial-statement.yaml
index d54eac2..ef9494a 100644
--- a/swagger/defs/financial-statement.yaml
+++ b/swagger/defs/financial-statement.yaml
@@ -1,52 +1,67 @@
 FinancialStatement:
-  type: object
   description: A financial statement for a company
   properties:
-    ID:
-      description: Record Id
-      type: string
     AccessNumber:
       description: EDGAR Access Number
       type: string
+      x-nullable: true
     AccountID:
       description: Account ID
       type: string
+      x-nullable: true
     CloudRevenue:
       description: Cloud Revenue
       type: number
+      x-nullable: true
     CreatedByID:
       description: Created By User ID
       type: string
+      x-nullable: true
     CreatedDate:
       description: Created Date
       type: string
+      x-nullable: true
     Description:
       description: Description
       type: string
+      x-nullable: true
     EdgarURL:
       description: EDGAR URL
       type: string
+      x-nullable: true
     FilingType:
       description: Filing Type
       type: string
+      x-nullable: true
     GrossProfit:
       description: Gross Profit
       type: number
+      x-nullable: true
+    ID:
+      description: Record Id
+      type: string
     LastModifiedByID:
       description: Last Modified By User ID
       type: string
+      x-nullable: true
     LastModifiedDate:
       description: Last Modified Date
       type: string
+      x-nullable: true
     NetIncome:
       description: Net Income
       type: number
+      x-nullable: true
     PeriodEndDate:
       description: Period End Date
       type: string
+      x-nullable: true
     TotalRevenue:
       description: Total Revenue
       type: number
+      x-nullable: true
     Year:
       description: Year
       type: string
+      x-nullable: true
+  type: object
diff --git a/swagger/defs/industry-company.yaml b/swagger/defs/industry-company.yaml
index feeed50..7fda59a 100644
--- a/swagger/defs/industry-company.yaml
+++ b/swagger/defs/industry-company.yaml
@@ -1,25 +1,50 @@
 IndustryCompany:
-  description: Junction object between Industry and Company
+  description: Junction object between Industry and Company (Account)
   properties:
-    ID:
-      description: Record Id
-      type: string
-    AccountID:
+    CompanyID:
       type: string
+      x-nullable: true
     CreatedByID:
       description: Created By User ID
       type: string
+      x-nullable: true
     CreatedDate:
       description: Created Date
       type: string
+      x-nullable: true
+    ID:
+      description: Record Id
+      type: string
     IndustryID:
       type: string
+      x-nullable: true
     LastModifiedByID:
       description: Last Modified By User ID
       type: string
+      x-nullable: true
     LastModifiedDate:
       description: Last Modified Date
       type: string
+      x-nullable: true
     Path:
       type: string
+      x-nullable: true
+    CompanyName:
+      type: string
+      x-nullable: true
+    CompanySlug:
+      type: string
+      x-nullable: true
+    CompanyTagLine:
+      type: string
+      x-nullable: true
+    IndustryName:
+      type: string
+      x-nullable: true
+    IndustrySlug:
+      type: string
+      x-nullable: true
+    IndustryTagLine:
+      type: string
+      x-nullable: true
   type: object
diff --git a/swagger/defs/industry-product.yaml b/swagger/defs/industry-product.yaml
index 56439f9..b7e4892 100644
--- a/swagger/defs/industry-product.yaml
+++ b/swagger/defs/industry-product.yaml
@@ -1,11 +1,6 @@
 IndustryProduct:
   description: Junction object between Industry and CompanyProduct
   properties:
-    ID:
-      description: Record Id
-      type: string
-    CompanyProduct:
-      $ref: "./company-product.yaml#/CompanyProduct"
     CompanyProductID:
       type: string
       x-nullable: true
@@ -17,8 +12,12 @@ IndustryProduct:
       description: Created Date
       type: string
       x-nullable: true
-    Industry:
-      $ref: "./industry.yaml#/Industry"
+    HTML:
+      type: string
+      x-nullable: true
+    ID:
+      description: Record Id
+      type: string
     IndustryID:
       type: string
       x-nullable: true
diff --git a/swagger/defs/industry-service.yaml b/swagger/defs/industry-service.yaml
index 144d64c..5e6099e 100644
--- a/swagger/defs/industry-service.yaml
+++ b/swagger/defs/industry-service.yaml
@@ -30,4 +30,4 @@ IndustryService:
       description: Last Modified Date
       type: string
       x-nullable: true
-  type: object
+  type: object
\ No newline at end of file
diff --git a/swagger/defs/industry.yaml b/swagger/defs/industry.yaml
index eca3a37..207a858 100644
--- a/swagger/defs/industry.yaml
+++ b/swagger/defs/industry.yaml
@@ -84,4 +84,4 @@ Industry:
       description: TagLine
       type: string
       x-nullable: true
-  type: object
+  type: object
\ No newline at end of file
diff --git a/swagger/defs/topic.yaml b/swagger/defs/topic.yaml
index 247485b..1622fd3 100644
--- a/swagger/defs/topic.yaml
+++ b/swagger/defs/topic.yaml
@@ -1,9 +1,6 @@
 Topic:
   description: A research topic that collects data
   properties:
-    ID:
-      description: Record Id
-      type: string
     CreatedByID:
       description: Created By User ID
       type: string
@@ -22,6 +19,9 @@ Topic:
         $ref: "./factor.yaml#/Factor"
       type: array
       x-nullable: true
+    ID:
+      description: Record Id
+      type: string
     LastModifiedByID:
       description: Last Modified By User ID
       type: string
diff --git a/swagger/external/research-vernonkeenan.yaml b/swagger/external/research-vernonkeenan.yaml
index 5425ada..e6ee421 100644
--- a/swagger/external/research-vernonkeenan.yaml
+++ b/swagger/external/research-vernonkeenan.yaml
@@ -1151,36 +1151,7 @@ paths:
 
 definitions:
   Address:
-    properties:
-      City:
-        description: City
-        type: string
-        x-nullable: true
-      Country:
-        description: Country full name
-        type: string
-        x-nullable: true
-      CountryCode:
-        description: Country Code
-        type: string
-        x-nullable: true
-      PostalCode:
-        description: Postal Code
-        type: string
-        x-nullable: true
-      State:
-        description: State full name
-        type: string
-        x-nullable: true
-      StateCode:
-        description: State Code
-        type: string
-        x-nullable: true
-      Street:
-        description: Street number and name
-        type: string
-        x-nullable: true
-    type: object
+    $ref: "../../lib/swagger/defs/address.yaml#/Address"
   CompanyCategory:
     properties:
       CloudType:
@@ -1200,137 +1171,12 @@ definitions:
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  CompanyProduct:
-    description: A software product or service vended by a Company
-    properties:
-      AccountID:
-        description: ID of the Company that owns this Product
-        type: string
-        x-nullable: true
-      AccountNumber:
-        description: Account Number
-        type: string
-        x-nullable: true
-      AccountName:
-        description: Account Name
-        type: string
-        x-nullable: true
-      AccountPublish:
-        description: Account Publish
-        type: boolean
-        x-nullable: true
-      AccountWebsite:
-        description: Account Website
-        type: string
-        x-nullable: true
-      AccountEmail:
-        description: Account Email
-        type: string
-        x-nullable: true
-      AccountLogo:
-        description: Account Logo
-        type: string
-        x-nullable: true
-      AccountSlug:
-        description: Account Slug
-        type: string
-        x-nullable: true
-      AppExchange:
-        description: Salesforce AppExchange URL
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Description of product
-        type: string
-        x-nullable: true
-      EnrichmentStatus:
-        description: Enrichment Status
-        type: string
-        x-nullable: true
-      FullDescription:
-        description: Full Description of product
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      ImageAltText:
-        description: Image Alt Text
-        type: string
-        x-nullable: true
-      ImageURL:
-        description: Image URL
-        type: string
-        x-nullable: true
-      Industries:
-        description: Industries
-        items:
-          $ref: "#/definitions/Industry"
-        type: array
-        x-nullable: true
-      LastEnrichedByID:
-        description: Last Enriched By User ID
-        type: string
-        x-nullable: true
-      LastEnrichmentDate:
-        description: Last Enriched Date
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Logo:
-        description: Logo
-        type: string
-        x-nullable: true
-      Name:
-        description: Product Name
-        type: string
-        x-nullable: true
-      ProductVideoID:
-        description: Product Video ID
-        type: string
-        x-nullable: true
-      Published:
-        description: Published
-        type: boolean
-        x-nullable: true
-      SalesforceSpecific:
-        description: Salesforce Specific
-        type: boolean
-        x-nullable: true
-      Slug:
-        description: Slug
-        type: string
-        x-nullable: true
-      TagLine:
-        description: TagLine
-        type: string
-        x-nullable: true
-      URL:
-        description: Website
-        type: string
-        x-nullable: true
-    type: object
   CompanyProductRequest:
     description: An array of CompanyProduct objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyProduct"
+          $ref: "../../lib/swagger/defs/company-product.yaml#/CompanyProduct"
         type: array
     type: object
   CompanyProductResponse:
@@ -1338,141 +1184,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyProduct"
+          $ref: "../../lib/swagger/defs/company-product.yaml#/CompanyProduct"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  CompanyService:
-    description: A service performed by a Company
-    properties:
-      ID:
-        description: Record Id
-        type: string
-      AccountID:
-        description: ID of the Company that owns this Service
-        type: string
-      AccountNumber:
-        description: Account Number
-        type: string
-        x-nullable: true
-      AccountName:
-        description: Account Name
-        type: string
-        x-nullable: true
-      AccountPublish:
-        description: Account Publish
-        type: boolean
-        x-nullable: true
-      AccountWebsite:
-        description: Account Website
-        type: string
-        x-nullable: true
-      AccountEmail:
-        description: Account Email
-        type: string
-        x-nullable: true
-      AccountLogo:
-        description: Account Logo
-        type: string
-        x-nullable: true
-      AccountSlug:
-        description: Account Slug
-        type: string
-        x-nullable: true
-      AppExchange:
-        description: Salesforce AppExchange URL
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Description of service
-        type: string
-        x-nullable: true
-      EnrichmentStatus:
-        description: Enrichment Status
-        type: string
-        x-nullable: true
-      FullDescription:
-        description: Full Description of service
-        type: string
-        x-nullable: true
-      ImageAltText:
-        description: Image Alt Text
-        type: string
-        x-nullable: true
-      ImageURL:
-        description: Image URL
-        type: string
-        x-nullable: true
-      Industries:
-        description: Industries
-        items:
-          $ref: "#/definitions/Industry"
-        type: array
-        x-nullable: true
-      LastEnrichedByID:
-        description: Last Enriched By User ID
-        type: string
-        x-nullable: true
-      LastEnrichmentDate:
-        description: Last Enriched Date
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Logo:
-        description: Logo
-        type: string
-        x-nullable: true
-      Name:
-        description: Service Name
-        type: string
-        x-nullable: true
-      Published:
-        description: Published
-        type: boolean
-        x-nullable: true
-      SalesforceSpecific:
-        description: Salesforce Specific
-        type: boolean
-        x-nullable: true
-      ServiceVideoID:
-        description: Service Video ID
-        type: string
-        x-nullable: true
-      Slug:
-        description: Slug
-        type: string
-        x-nullable: true
-      TagLine:
-        description: Tag Line
-        type: string
-        x-nullable: true
-      URL:
-        description: URL
-        type: string
-        x-nullable: true
-    type: object
   CompanyServiceRequest:
     description: An array of CompanyService objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyService"
+          $ref: "../../lib/swagger/defs/company-service.yaml#/CompanyService"
         type: array
     type: object
   CompanyServiceResponse:
@@ -1480,7 +1202,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyService"
+          $ref: "../../lib/swagger/defs/company-service.yaml#/CompanyService"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -1496,57 +1218,12 @@ definitions:
     type: object
   Error:
     $ref: ../../lib/swagger/defs/error.yaml#/Error
-  Factor:
-    description: A Factor of analysis within a research topic
-    properties:
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Topic Description
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Name:
-        description: Factor Name
-        type: string
-        x-nullable: true
-      Observations:
-        description: The list of Observations used to analyze this industry
-        items:
-          $ref: "#/definitions/Observation"
-        type: array
-        x-nullable: true
-      Slug:
-        description: The slug of the corresponding page on the CMS
-        type: string
-        x-nullable: true
-      TopicID:
-        description: The ID of the Topic that owns this Factor
-        type: string
-        x-nullable: true
-    type: object
   FactorRequest:
     description: An array of Factor objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/Factor"
+          $ref: "../../lib/swagger/defs/factor.yaml#/Factor"
         type: array
     type: object
   FactorResponse:
@@ -1554,84 +1231,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Factor"
+          $ref: "../../lib/swagger/defs/factor.yaml#/Factor"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  FinancialStatement:
-    description: A financial statement for a company
-    properties:
-      AccessNumber:
-        description: EDGAR Access Number
-        type: string
-        x-nullable: true
-      AccountID:
-        description: Account ID
-        type: string
-        x-nullable: true
-      CloudRevenue:
-        description: Cloud Revenue
-        type: number
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Description
-        type: string
-        x-nullable: true
-      EdgarURL:
-        description: EDGAR URL
-        type: string
-        x-nullable: true
-      FilingType:
-        description: Filing Type
-        type: string
-        x-nullable: true
-      GrossProfit:
-        description: Gross Profit
-        type: number
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      NetIncome:
-        description: Net Income
-        type: number
-        x-nullable: true
-      PeriodEndDate:
-        description: Period End Date
-        type: string
-        x-nullable: true
-      TotalRevenue:
-        description: Total Revenue
-        type: number
-        x-nullable: true
-      Year:
-        description: Year
-        type: string
-        x-nullable: true
-    type: object
   FinancialStatementRequest:
     description: An array of FinancialStatement objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/FinancialStatement"
+          $ref: "../../lib/swagger/defs/financial-statement.yaml#/FinancialStatement"
         type: array
     type: object
   FinancialStatementResponse:
@@ -1639,136 +1249,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/FinancialStatement"
+          $ref: "../../lib/swagger/defs/financial-statement.yaml#/FinancialStatement"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  Industry:
-    description: An industry that is being researched
-    properties:
-      ID:
-        description: Record Id
-        type: string
-      CompanyProducts:
-        description: The list of Products in this industry
-        items:
-          $ref: "#/definitions/CompanyProduct"
-        type: array
-        x-nullable: true
-      CompanyServices:
-        description: The list of Services in this industry
-        items:
-          $ref: "#/definitions/CompanyService"
-        type: array
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Industry Description
-        type: string
-        x-nullable: true
-      FullDescription:
-        description: Full Description
-        type: string
-        x-nullable: true
-      ImageAltText:
-        description: Image Alt Text
-        type: string
-        x-nullable: true
-      ImageURL:
-        description: Image URL
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Level:
-        description: The hierarchical level of this Industry
-        type: string
-        x-nullable: true
-      Logo:
-        description: Logo
-        type: string
-        x-nullable: true
-      Name:
-        description: Industry Name
-        type: string
-        x-nullable: true
-      ParentIndustryID:
-        description: The ID of the Parent Industry
-        type: string
-        x-nullable: true
-      Path:
-        description: The full path of this industry, including Parent
-        type: string
-        x-nullable: true
-      ProductCategory:
-        description: Is this industry a product category?
-        type: boolean
-        x-nullable: true
-      ServiceCategory:
-        description: Is this industry a service category?
-        type: boolean
-        x-nullable: true
-      Slug:
-        description: The CMS Slug for this Industry
-        type: string
-        x-nullable: true
-      TagLine:
-        description: TagLine
-        type: string
-        x-nullable: true
-    type: object
-  IndustryCompany:
-    description: Junction object between Industry and Company
-    properties:
-      CompanyID:
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      IndustryID:
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Path:
-        type: string
-        x-nullable: true
-    type: object
   IndustryCompanyRequest:
     description: An array of IndustryCompany objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryCompany"
+          $ref: "../../lib/swagger/defs/industry-company.yaml#/IndustryCompany"
         type: array
     type: object
   IndustryCompanyResponse:
@@ -1776,49 +1267,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryCompany"
+          $ref: "../../lib/swagger/defs/industry-company.yaml#/IndustryCompany"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  IndustryProduct:
-    description: Junction object between Industry and CompanyProduct
-    properties:
-      CompanyProductID:
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      HTML:
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      IndustryID:
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-    type: object
   IndustryProductRequest:
     description: An array of IndustryProduct objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryProduct"
+          $ref: "../../lib/swagger/defs/industry-product.yaml#/IndustryProduct"
         type: array
     type: object
   IndustryProductResponse:
@@ -1826,50 +1285,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryProduct"
+          $ref: "../../lib/swagger/defs/industry-product.yaml#/IndustryProduct"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  IndustryService:
-    description: Junction Object bewtwen Industry and CompanyService
-    properties:
-      ID:
-        description: Record Id
-        type: string
-      CompanyService:
-        $ref: "#/definitions/CompanyService"
-      CompanyServiceID:
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Industry:
-        $ref: "#/definitions/Industry"
-      IndustryID:
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-    type: object
   IndustryServiceRequest:
     description: An array of IndustryService objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryService"
+          $ref: "../../lib/swagger/defs/industry-service.yaml#/IndustryService"
         type: array
     type: object
   IndustryServiceResponse:
@@ -1877,7 +1303,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryService"
+          $ref: "../../lib/swagger/defs/industry-service.yaml#/IndustryService"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -1887,7 +1313,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Industry"
+          $ref: "../../lib/swagger/defs/industry.yaml#/Industry"
         type: array
     type: object
   IndustryResponse:
@@ -1895,7 +1321,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Industry"
+          $ref: "../../lib/swagger/defs/industry.yaml#/Industry"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -1919,59 +1345,12 @@ definitions:
         format: int64
         type: number
     type: object
-  Observation:
-    description: A data point collected while analyzing a Factor
-    properties:
-      AccountID:
-        description: The ID of the Company being analyzed
-        type: string
-        x-nullable: true
-      CompanyProductID:
-        description: The ID of the Product being analyzed
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Notes concerning data collection
-        type: string
-        x-nullable: true
-      FactorID:
-        description: The ID of the Factor that owns this Observation
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      SubjectType:
-        description: Is the subject a Company or a Product?
-        type: string
-        x-nullable: true
-      Value:
-        description: The data point collected
-        type: string
-        x-nullable: true
-    type: object
   ObservationRequest:
     description: An array of Observation objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/Observation"
+          $ref: "../../lib/swagger/defs/observation.yaml#/Observation"
         type: array
     type: object
   ObservationResponse:
@@ -1979,7 +1358,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Observation"
+          $ref: "../../lib/swagger/defs/observation.yaml#/Observation"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -2045,57 +1424,12 @@ definitions:
         description: Account Number used for recording transactions
         type: string
     type: object
-  Topic:
-    description: A research topic that collects data
-    properties:
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Topic Description
-        type: string
-        x-nullable: true
-      Factors:
-        description: The list of Factors used to analyze this industry
-        items:
-          $ref: "#/definitions/Factor"
-        type: array
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Name:
-        description: Topic Name
-        type: string
-        x-nullable: true
-      ParentTopicID:
-        description: The ID of the Parent Topic
-        type: string
-        x-nullable: true
-      Slug:
-        description: The CMS Slug for this Topic
-        type: string
-        x-nullable: true
-    type: object
   TopicRequest:
     description: An array of Topic objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/Topic"
+          $ref: "../../lib/swagger/defs/topic.yaml#/Topic"
         type: array
     type: object
   TopicResponse:
@@ -2103,7 +1437,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Topic"
+          $ref: "../../lib/swagger/defs/topic.yaml#/Topic"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
diff --git a/swagger/research-vernonkeenan.yaml b/swagger/research-vernonkeenan.yaml
index ca1c7c9..3731c87 100644
--- a/swagger/research-vernonkeenan.yaml
+++ b/swagger/research-vernonkeenan.yaml
@@ -1151,36 +1151,7 @@ paths:
 
 definitions:
   Address:
-    properties:
-      City:
-        description: City
-        type: string
-        x-nullable: true
-      Country:
-        description: Country full name
-        type: string
-        x-nullable: true
-      CountryCode:
-        description: Country Code
-        type: string
-        x-nullable: true
-      PostalCode:
-        description: Postal Code
-        type: string
-        x-nullable: true
-      State:
-        description: State full name
-        type: string
-        x-nullable: true
-      StateCode:
-        description: State Code
-        type: string
-        x-nullable: true
-      Street:
-        description: Street number and name
-        type: string
-        x-nullable: true
-    type: object
+    $ref: "../../lib/swagger/defs/address.yaml#/Address"
   CompanyCategory:
     properties:
       CloudType:
@@ -1200,137 +1171,12 @@ definitions:
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  CompanyProduct:
-    description: A software product or service vended by a Company
-    properties:
-      AccountID:
-        description: ID of the Company that owns this Product
-        type: string
-        x-nullable: true
-      AccountNumber:
-        description: Account Number
-        type: string
-        x-nullable: true
-      AccountName:
-        description: Account Name
-        type: string
-        x-nullable: true
-      AccountPublish:
-        description: Account Publish
-        type: boolean
-        x-nullable: true
-      AccountWebsite:
-        description: Account Website
-        type: string
-        x-nullable: true
-      AccountEmail:
-        description: Account Email
-        type: string
-        x-nullable: true
-      AccountLogo:
-        description: Account Logo
-        type: string
-        x-nullable: true
-      AccountSlug:
-        description: Account Slug
-        type: string
-        x-nullable: true
-      AppExchange:
-        description: Salesforce AppExchange URL
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Description of product
-        type: string
-        x-nullable: true
-      EnrichmentStatus:
-        description: Enrichment Status
-        type: string
-        x-nullable: true
-      FullDescription:
-        description: Full Description of product
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      ImageAltText:
-        description: Image Alt Text
-        type: string
-        x-nullable: true
-      ImageURL:
-        description: Image URL
-        type: string
-        x-nullable: true
-      Industries:
-        description: Industries
-        items:
-          $ref: "#/definitions/Industry"
-        type: array
-        x-nullable: true
-      LastEnrichedByID:
-        description: Last Enriched By User ID
-        type: string
-        x-nullable: true
-      LastEnrichmentDate:
-        description: Last Enriched Date
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Logo:
-        description: Logo
-        type: string
-        x-nullable: true
-      Name:
-        description: Product Name
-        type: string
-        x-nullable: true
-      ProductVideoID:
-        description: Product Video ID
-        type: string
-        x-nullable: true
-      Published:
-        description: Published
-        type: boolean
-        x-nullable: true
-      SalesforceSpecific:
-        description: Salesforce Specific
-        type: boolean
-        x-nullable: true
-      Slug:
-        description: Slug
-        type: string
-        x-nullable: true
-      TagLine:
-        description: TagLine
-        type: string
-        x-nullable: true
-      URL:
-        description: Website
-        type: string
-        x-nullable: true
-    type: object
   CompanyProductRequest:
     description: An array of CompanyProduct objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyProduct"
+          $ref: "../../lib/swagger/defs/company-product.yaml#/CompanyProduct"
         type: array
     type: object
   CompanyProductResponse:
@@ -1338,141 +1184,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyProduct"
+          $ref: "../../lib/swagger/defs/company-product.yaml#/CompanyProduct"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  CompanyService:
-    description: A service performed by a Company
-    properties:
-      ID:
-        description: Record Id
-        type: string
-      AccountID:
-        description: ID of the Company that owns this Service
-        type: string
-      AccountNumber:
-        description: Account Number
-        type: string
-        x-nullable: true
-      AccountName:
-        description: Account Name
-        type: string
-        x-nullable: true
-      AccountPublish:
-        description: Account Publish
-        type: boolean
-        x-nullable: true
-      AccountWebsite:
-        description: Account Website
-        type: string
-        x-nullable: true
-      AccountEmail:
-        description: Account Email
-        type: string
-        x-nullable: true
-      AccountLogo:
-        description: Account Logo
-        type: string
-        x-nullable: true
-      AccountSlug:
-        description: Account Slug
-        type: string
-        x-nullable: true
-      AppExchange:
-        description: Salesforce AppExchange URL
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Description of service
-        type: string
-        x-nullable: true
-      EnrichmentStatus:
-        description: Enrichment Status
-        type: string
-        x-nullable: true
-      FullDescription:
-        description: Full Description of service
-        type: string
-        x-nullable: true
-      ImageAltText:
-        description: Image Alt Text
-        type: string
-        x-nullable: true
-      ImageURL:
-        description: Image URL
-        type: string
-        x-nullable: true
-      Industries:
-        description: Industries
-        items:
-          $ref: "#/definitions/Industry"
-        type: array
-        x-nullable: true
-      LastEnrichedByID:
-        description: Last Enriched By User ID
-        type: string
-        x-nullable: true
-      LastEnrichmentDate:
-        description: Last Enriched Date
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Logo:
-        description: Logo
-        type: string
-        x-nullable: true
-      Name:
-        description: Service Name
-        type: string
-        x-nullable: true
-      Published:
-        description: Published
-        type: boolean
-        x-nullable: true
-      SalesforceSpecific:
-        description: Salesforce Specific
-        type: boolean
-        x-nullable: true
-      ServiceVideoID:
-        description: Service Video ID
-        type: string
-        x-nullable: true
-      Slug:
-        description: Slug
-        type: string
-        x-nullable: true
-      TagLine:
-        description: Tag Line
-        type: string
-        x-nullable: true
-      URL:
-        description: URL
-        type: string
-        x-nullable: true
-    type: object
   CompanyServiceRequest:
     description: An array of CompanyService objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyService"
+          $ref: "../../lib/swagger/defs/company-service.yaml#/CompanyService"
         type: array
     type: object
   CompanyServiceResponse:
@@ -1480,7 +1202,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/CompanyService"
+          $ref: "../../lib/swagger/defs/company-service.yaml#/CompanyService"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -1496,57 +1218,12 @@ definitions:
     type: object
   Error:
     $ref: ../../lib/swagger/defs/error.yaml#/Error
-  Factor:
-    description: A Factor of analysis within a research topic
-    properties:
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Topic Description
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Name:
-        description: Factor Name
-        type: string
-        x-nullable: true
-      Observations:
-        description: The list of Observations used to analyze this industry
-        items:
-          $ref: "#/definitions/Observation"
-        type: array
-        x-nullable: true
-      Slug:
-        description: The slug of the corresponding page on the CMS
-        type: string
-        x-nullable: true
-      TopicID:
-        description: The ID of the Topic that owns this Factor
-        type: string
-        x-nullable: true
-    type: object
   FactorRequest:
     description: An array of Factor objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/Factor"
+          $ref: "../../lib/swagger/defs/factor.yaml#/Factor"
         type: array
     type: object
   FactorResponse:
@@ -1554,84 +1231,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Factor"
+          $ref: "../../lib/swagger/defs/factor.yaml#/Factor"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  FinancialStatement:
-    description: A financial statement for a company
-    properties:
-      AccessNumber:
-        description: EDGAR Access Number
-        type: string
-        x-nullable: true
-      AccountID:
-        description: Account ID
-        type: string
-        x-nullable: true
-      CloudRevenue:
-        description: Cloud Revenue
-        type: number
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Description
-        type: string
-        x-nullable: true
-      EdgarURL:
-        description: EDGAR URL
-        type: string
-        x-nullable: true
-      FilingType:
-        description: Filing Type
-        type: string
-        x-nullable: true
-      GrossProfit:
-        description: Gross Profit
-        type: number
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      NetIncome:
-        description: Net Income
-        type: number
-        x-nullable: true
-      PeriodEndDate:
-        description: Period End Date
-        type: string
-        x-nullable: true
-      TotalRevenue:
-        description: Total Revenue
-        type: number
-        x-nullable: true
-      Year:
-        description: Year
-        type: string
-        x-nullable: true
-    type: object
   FinancialStatementRequest:
     description: An array of FinancialStatement objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/FinancialStatement"
+          $ref: "../../lib/swagger/defs/financial-statement.yaml#/FinancialStatement"
         type: array
     type: object
   FinancialStatementResponse:
@@ -1639,136 +1249,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/FinancialStatement"
+          $ref: "../../lib/swagger/defs/financial-statement.yaml#/FinancialStatement"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  Industry:
-    description: An industry that is being researched
-    properties:
-      ID:
-        description: Record Id
-        type: string
-      CompanyProducts:
-        description: The list of Products in this industry
-        items:
-          $ref: "#/definitions/CompanyProduct"
-        type: array
-        x-nullable: true
-      CompanyServices:
-        description: The list of Services in this industry
-        items:
-          $ref: "#/definitions/CompanyService"
-        type: array
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Industry Description
-        type: string
-        x-nullable: true
-      FullDescription:
-        description: Full Description
-        type: string
-        x-nullable: true
-      ImageAltText:
-        description: Image Alt Text
-        type: string
-        x-nullable: true
-      ImageURL:
-        description: Image URL
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Level:
-        description: The hierarchical level of this Industry
-        type: string
-        x-nullable: true
-      Logo:
-        description: Logo
-        type: string
-        x-nullable: true
-      Name:
-        description: Industry Name
-        type: string
-        x-nullable: true
-      ParentIndustryID:
-        description: The ID of the Parent Industry
-        type: string
-        x-nullable: true
-      Path:
-        description: The full path of this industry, including Parent
-        type: string
-        x-nullable: true
-      ProductCategory:
-        description: Is this industry a product category?
-        type: boolean
-        x-nullable: true
-      ServiceCategory:
-        description: Is this industry a service category?
-        type: boolean
-        x-nullable: true
-      Slug:
-        description: The CMS Slug for this Industry
-        type: string
-        x-nullable: true
-      TagLine:
-        description: TagLine
-        type: string
-        x-nullable: true
-    type: object
-  IndustryCompany:
-    description: Junction object between Industry and Company
-    properties:
-      CompanyID:
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      IndustryID:
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Path:
-        type: string
-        x-nullable: true
-    type: object
   IndustryCompanyRequest:
     description: An array of IndustryCompany objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryCompany"
+          $ref: "../../lib/swagger/defs/industry-company.yaml#/IndustryCompany"
         type: array
     type: object
   IndustryCompanyResponse:
@@ -1776,49 +1267,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryCompany"
+          $ref: "../../lib/swagger/defs/industry-company.yaml#/IndustryCompany"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  IndustryProduct:
-    description: Junction object between Industry and CompanyProduct
-    properties:
-      CompanyProductID:
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      HTML:
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      IndustryID:
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-    type: object
   IndustryProductRequest:
     description: An array of IndustryProduct objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryProduct"
+          $ref: "../../lib/swagger/defs/industry-product.yaml#/IndustryProduct"
         type: array
     type: object
   IndustryProductResponse:
@@ -1826,50 +1285,17 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryProduct"
+          $ref: "../../lib/swagger/defs/industry-product.yaml#/IndustryProduct"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
     type: object
-  IndustryService:
-    description: Junction Object bewtwen Industry and CompanyService
-    properties:
-      ID:
-        description: Record Id
-        type: string
-      CompanyService:
-        $ref: "#/definitions/CompanyService"
-      CompanyServiceID:
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Industry:
-        $ref: "#/definitions/Industry"
-      IndustryID:
-        type: string
-        x-nullable: true
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-    type: object
   IndustryServiceRequest:
     description: An array of IndustryService objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryService"
+          $ref: "../../lib/swagger/defs/industry-service.yaml#/IndustryService"
         type: array
     type: object
   IndustryServiceResponse:
@@ -1877,7 +1303,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/IndustryService"
+          $ref: "../../lib/swagger/defs/industry-service.yaml#/IndustryService"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -1887,7 +1313,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Industry"
+          $ref: "../../lib/swagger/defs/industry.yaml#/Industry"
         type: array
     type: object
   IndustryResponse:
@@ -1895,7 +1321,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Industry"
+          $ref: "../../lib/swagger/defs/industry.yaml#/Industry"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -1919,59 +1345,12 @@ definitions:
         format: int64
         type: number
     type: object
-  Observation:
-    description: A data point collected while analyzing a Factor
-    properties:
-      AccountID:
-        description: The ID of the Company being analyzed
-        type: string
-        x-nullable: true
-      CompanyProductID:
-        description: The ID of the Product being analyzed
-        type: string
-        x-nullable: true
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Notes concerning data collection
-        type: string
-        x-nullable: true
-      FactorID:
-        description: The ID of the Factor that owns this Observation
-        type: string
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      SubjectType:
-        description: Is the subject a Company or a Product?
-        type: string
-        x-nullable: true
-      Value:
-        description: The data point collected
-        type: string
-        x-nullable: true
-    type: object
   ObservationRequest:
     description: An array of Observation objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/Observation"
+          $ref: "../../lib/swagger/defs/observation.yaml#/Observation"
         type: array
     type: object
   ObservationResponse:
@@ -1979,7 +1358,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Observation"
+          $ref: "../../lib/swagger/defs/observation.yaml#/Observation"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"
@@ -2045,57 +1424,12 @@ definitions:
         description: Account Number used for recording transactions
         type: string
     type: object
-  Topic:
-    description: A research topic that collects data
-    properties:
-      CreatedByID:
-        description: Created By User ID
-        type: string
-        x-nullable: true
-      CreatedDate:
-        description: Created Date
-        type: string
-        x-nullable: true
-      Description:
-        description: Topic Description
-        type: string
-        x-nullable: true
-      Factors:
-        description: The list of Factors used to analyze this industry
-        items:
-          $ref: "#/definitions/Factor"
-        type: array
-        x-nullable: true
-      ID:
-        description: Record Id
-        type: string
-      LastModifiedByID:
-        description: Last Modified By User ID
-        type: string
-        x-nullable: true
-      LastModifiedDate:
-        description: Last Modified Date
-        type: string
-        x-nullable: true
-      Name:
-        description: Topic Name
-        type: string
-        x-nullable: true
-      ParentTopicID:
-        description: The ID of the Parent Topic
-        type: string
-        x-nullable: true
-      Slug:
-        description: The CMS Slug for this Topic
-        type: string
-        x-nullable: true
-    type: object
   TopicRequest:
     description: An array of Topic objects submitted for processing
     properties:
       Data:
         items:
-          $ref: "#/definitions/Topic"
+          $ref: "../../lib/swagger/defs/topic.yaml#/Topic"
         type: array
     type: object
   TopicResponse:
@@ -2103,7 +1437,7 @@ definitions:
     properties:
       Data:
         items:
-          $ref: "#/definitions/Topic"
+          $ref: "../../lib/swagger/defs/topic.yaml#/Topic"
         type: array
       Meta:
         $ref: "#/definitions/ResponseMeta"