diff --git a/src/main/kotlin/id/walt/issuer/backend/IssuerController.kt b/src/main/kotlin/id/walt/issuer/backend/IssuerController.kt
index db104690..5a0ad903 100644
--- a/src/main/kotlin/id/walt/issuer/backend/IssuerController.kt
+++ b/src/main/kotlin/id/walt/issuer/backend/IssuerController.kt
@@ -15,6 +15,7 @@ import id.walt.multitenancy.Tenant
 import id.walt.multitenancy.TenantId
 import id.walt.rest.core.DidController
 import id.walt.rest.core.KeyController
+import id.walt.rest.core.VcController
 import id.walt.services.oidc.OIDC4CIService
 import id.walt.signatory.rest.SignatoryController
 import id.walt.verifier.backend.WalletConfiguration
@@ -60,7 +61,10 @@ object IssuerController {
                     fun OpenApiDocumentation.describeTenantId() =
                         this.run { pathParam<String>("tenantId") { it.example(TenantId.DEFAULT_TENANT) } }
 
-                    path("did") {
+                    path("did") {                                                
+                        get("list", documented(DidController.listDocs().describeTenantId(), DidController::list))
+                        get("{id}", documented(DidController.loadDocs().describeTenantId(), DidController::load))
+                        delete("{id}", documented(DidController.deleteDocs().describeTenantId(), DidController::delete))
                         post("create", documented(DidController.createDocs().describeTenantId(), DidController::create))
                         post("createAdvanced",
                             documented(document().operation {
@@ -74,18 +78,17 @@ object IssuerController {
                                 WalletController::createDid
                             )
                         )
+                        post("resolve", documented(DidController.resolveDocs().describeTenantId(), DidController::resolve))
                         post("import", documented(DidController.importDocs().describeTenantId(), DidController::import))
-                        get("list", documented(DidController.listDocs().describeTenantId(), DidController::list))
-                        post("delete", documented(DidController.deleteDocs().describeTenantId(), DidController::delete))
                     }
 
                     path("key") {
+                        get("list", documented(KeyController.listDocs().describeTenantId(), KeyController::list))
+                        get("{id}", documented(KeyController.loadDocs().describeTenantId(), KeyController::load))
+                        delete("{id}", documented(KeyController.deleteDocs().describeTenantId(), KeyController::delete))
                         post("gen", documented(KeyController.genDocs().describeTenantId(), KeyController::gen))
                         post("import", documented(KeyController.importDocs().describeTenantId(), KeyController::import))
                         post("export", documented(KeyController.exportDocs().describeTenantId(), KeyController::export))
-                        delete("delete", documented(KeyController.deleteDocs().describeTenantId(), KeyController::delete))
-                        get("list", documented(KeyController.listDocs().describeTenantId(), KeyController::list))
-                        post("load", documented(KeyController.loadDocs().describeTenantId(), KeyController::load))
                     }
 
                     post("setConfiguration", documented(document().operation {
diff --git a/src/main/kotlin/id/walt/multitenancy/MultitenancyController.kt b/src/main/kotlin/id/walt/multitenancy/MultitenancyController.kt
index 0cc15420..6217c1ce 100644
--- a/src/main/kotlin/id/walt/multitenancy/MultitenancyController.kt
+++ b/src/main/kotlin/id/walt/multitenancy/MultitenancyController.kt
@@ -21,7 +21,7 @@ object MultitenancyController {
                         it.summary("List multitenancy *LOADED* tenants. If no tenants are loaded (e.g. right after a restart) this method will indeed return an empty list.")
                             .addTagsItem("Multitenancy")
                             .operationId("listLoadedTenants")
-                    }.json<List<TenantId>>("200"),
+                    }.jsonArray<TenantId>("200"),
                     MultitenancyController::listLoadedTenants
                 )
             )
@@ -36,7 +36,7 @@ object MultitenancyController {
                         )
                             .addTagsItem("Multitenancy")
                             .operationId("listAllTenantIdsByType")
-                    }.json<List<String>>("200"),
+                    }.jsonArray<String>("200"),
                     MultitenancyController::listAllTenantIdsByType
                 )
             )
diff --git a/src/main/kotlin/id/walt/webwallet/backend/wallet/WalletController.kt b/src/main/kotlin/id/walt/webwallet/backend/wallet/WalletController.kt
index e8858fea..7362e3d9 100644
--- a/src/main/kotlin/id/walt/webwallet/backend/wallet/WalletController.kt
+++ b/src/main/kotlin/id/walt/webwallet/backend/wallet/WalletController.kt
@@ -114,6 +114,11 @@ object WalletController {
                         documented(CustodianController.storeCredentialsDocs(), CustodianController::storeCredential),
                         UserRole.AUTHORIZED
                     )
+                    get(
+                        "{id}",
+                        documented(CustodianController.getCredentialDocs(), CustodianController::getCredential),
+                        UserRole.AUTHORIZED
+                    )
                 }
                 path("keys") {
                     get(