diff --git a/pkg/ecalc/ecalc.go b/pkg/ecalc/ecalc.go
index 16df70b..71fdc67 100644
--- a/pkg/ecalc/ecalc.go
+++ b/pkg/ecalc/ecalc.go
@@ -8,44 +8,44 @@ type Ecalc struct {
 }
 
 type CompanyFacts struct {
-	ID                               int                 `json:"id"`
-	TotalPurchaseFromSuppliers       int                 `json:"totalPurchaseFromSuppliers"`
-	TotalStaffCosts                  int                 `json:"totalStaffCosts"`
-	Profit                           int                 `json:"profit"`
-	FinancialCosts                   int                 `json:"financialCosts"`
-	IncomeFromFinancialInvestments   int                 `json:"incomeFromFinancialInvestments"`
-	AdditionsToFixedAssets           int                 `json:"additionsToFixedAssets"`
-	Turnover                         int                 `json:"turnover"`
-	TotalAssets                      int                 `json:"totalAssets"`
-	FinancialAssetsAndCashBalance    int                 `json:"financialAssetsAndCashBalance"`
-	SupplyFractions                  []SupplyFraction    `json:"supplyFractions"`
-	EmployeesFractions               []EmployeesFraction `json:"employeesFractions"`
-	IndustrySectors                  []IndustrySector    `json:"industrySectors"`
-	NumberOfEmployees                int                 `json:"numberOfEmployees"`
-	HasCanteen                       bool                `json:"hasCanteen"`
-	IsB2B                            bool                `json:"isB2B"`
-	AverageJourneyToWorkForStaffInKm float32             `json:"averageJourneyToWorkForStaffInKm"`
-	Rating                           Rating              `json:"rating"`
+	ID                               int                 `json:"id,omitempty"`
+	TotalPurchaseFromSuppliers       int                 `json:"totalPurchaseFromSuppliers,omitempty"`
+	TotalStaffCosts                  int                 `json:"totalStaffCosts,omitempty"`
+	Profit                           int                 `json:"profit,omitempty"`
+	FinancialCosts                   int                 `json:"financialCosts,omitempty"`
+	IncomeFromFinancialInvestments   int                 `json:"incomeFromFinancialInvestments,omitempty"`
+	AdditionsToFixedAssets           int                 `json:"additionsToFixedAssets,omitempty"`
+	Turnover                         int                 `json:"turnover,omitempty"`
+	TotalAssets                      int                 `json:"totalAssets,omitempty"`
+	FinancialAssetsAndCashBalance    int                 `json:"financialAssetsAndCashBalance,omitempty"`
+	SupplyFractions                  []SupplyFraction    `json:"supplyFractions,omitempty"`
+	EmployeesFractions               []EmployeesFraction `json:"employeesFractions,omitempty"`
+	IndustrySectors                  []IndustrySector    `json:"industrySectors,omitempty"`
+	NumberOfEmployees                int                 `json:"numberOfEmployees,omitempty"`
+	HasCanteen                       bool                `json:"hasCanteen,omitempty"`
+	IsB2B                            bool                `json:"isB2B,omitempty"`
+	AverageJourneyToWorkForStaffInKm float32             `json:"averageJourneyToWorkForStaffInKm,omitempty"`
+	Rating                           Rating              `json:"rating,omitempty"`
 }
 
 type SupplyFraction struct {
-	ID           int    `json:"id"`
-	IndustryCode string `json:"industryCode"`
-	CountryCode  string `json:"countryCode"`
-	Costs        int    `json:"costs"`
+	ID           int    `json:"id,omitempty"`
+	IndustryCode string `json:"industryCode,omitempty"`
+	CountryCode  string `json:"countryCode,omitempty"`
+	Costs        int    `json:"costs,omitempty"`
 }
 
 type EmployeesFraction struct {
-	ID          int     `json:"id"`
-	CountryCode string  `json:"countryCode"`
-	Percentage  float32 `json:"percentage"`
+	ID          int     `json:"id,omitempty"`
+	CountryCode string  `json:"countryCode,omitempty"`
+	Percentage  float32 `json:"percentage,omitempty"`
 }
 
 type IndustrySector struct {
-	ID                    int    `json:"id"`
-	IndustryCode          string `json:"industryCode"`
-	AmountOfTotalTurnover int    `json:"amountOfTotalTurnover"`
-	Description           string `json:"description"`
+	ID                    int    `json:"id,omitempty"`
+	IndustryCode          string `json:"industryCode,omitempty"`
+	AmountOfTotalTurnover int    `json:"amountOfTotalTurnover,omitempty"`
+	Description           string `json:"description,omitempty"`
 }
 
 type Rating struct {