diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index d8661f37e4..2dddd8b966 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -30,6 +30,7 @@ import { uuid } from './utils/uuid'
 export * from './plugins'
 export * from './transport'
 export * from './modules/basic-messages'
+export * from './modules/common'
 export * from './modules/credentials'
 export * from './modules/proofs'
 export * from './modules/connections'
diff --git a/packages/core/src/modules/connections/index.ts b/packages/core/src/modules/connections/index.ts
index 844d3c2c93..f384af2d2a 100644
--- a/packages/core/src/modules/connections/index.ts
+++ b/packages/core/src/modules/connections/index.ts
@@ -4,3 +4,4 @@ export * from './repository'
 export * from './services'
 export * from './ConnectionEvents'
 export * from './ConnectionsModule'
+export * from './DidExchangeProtocol'
diff --git a/packages/core/src/modules/dids/index.ts b/packages/core/src/modules/dids/index.ts
index 573f20b4cd..b34160b8de 100644
--- a/packages/core/src/modules/dids/index.ts
+++ b/packages/core/src/modules/dids/index.ts
@@ -1,5 +1,6 @@
 export * from './types'
 export * from './domain'
 export * from './DidsModule'
+export * from './repository'
 export * from './services'
 export { DidKey } from './methods/key/DidKey'
diff --git a/packages/core/src/modules/ledger/__tests__/IndyLedgerService.test.ts b/packages/core/src/modules/ledger/__tests__/IndyLedgerService.test.ts
index 88c5eb4fb5..0929cad3dd 100644
--- a/packages/core/src/modules/ledger/__tests__/IndyLedgerService.test.ts
+++ b/packages/core/src/modules/ledger/__tests__/IndyLedgerService.test.ts
@@ -13,7 +13,6 @@ jest.mock('../services/IndyPoolService')
 const IndyPoolServiceMock = IndyPoolService as jest.Mock<IndyPoolService>
 jest.mock('../../indy/services/IndyIssuerService')
 const IndyIssuerServiceMock = IndyIssuerService as jest.Mock<IndyIssuerService>
-
 jest.mock('../../../cache/CacheRepository')
 const CacheRepositoryMock = CacheRepository as jest.Mock<CacheRepository>
 
diff --git a/packages/core/src/modules/ledger/services/IndyLedgerService.ts b/packages/core/src/modules/ledger/services/IndyLedgerService.ts
index 01fcce8d1f..4bff165719 100644
--- a/packages/core/src/modules/ledger/services/IndyLedgerService.ts
+++ b/packages/core/src/modules/ledger/services/IndyLedgerService.ts
@@ -231,16 +231,6 @@ export class IndyLedgerService {
     }
   }
 
-  public async findByCredentialDefinitionId(credentialDefinitionId: string) {
-    try {
-      await this.getCredentialDefinition(credentialDefinitionId)
-    } catch (e) {
-      if (e instanceof IndySdkError) return null
-
-      throw e
-    }
-  }
-
   public async getCredentialDefinition(credentialDefinitionId: string) {
     const did = didFromCredentialDefinitionId(credentialDefinitionId)
     const { pool } = await this.indyPoolService.getPoolForDid(did)
diff --git a/packages/core/src/modules/oob/index.ts b/packages/core/src/modules/oob/index.ts
index 707c9301fe..e9873404a1 100644
--- a/packages/core/src/modules/oob/index.ts
+++ b/packages/core/src/modules/oob/index.ts
@@ -1,2 +1,4 @@
 export * from './messages'
 export * from './repository'
+export * from './OutOfBandModule'
+export * from './OutOfBandService'
diff --git a/packages/core/src/modules/routing/services/index.ts b/packages/core/src/modules/routing/services/index.ts
index 5d5083ae90..4026cfae8e 100644
--- a/packages/core/src/modules/routing/services/index.ts
+++ b/packages/core/src/modules/routing/services/index.ts
@@ -1,3 +1,4 @@
 export * from './MessagePickupService'
 export * from './MediationRecipientService'
 export * from './MediatorService'
+export * from './RoutingService'