add class service and CompanyContext final