diff --git a/pkg/types/core/capabilities_registry.go b/pkg/types/core/capabilities_registry.go
index bdaa3bbb6..c0603b723 100644
--- a/pkg/types/core/capabilities_registry.go
+++ b/pkg/types/core/capabilities_registry.go
@@ -10,12 +10,17 @@ import (
 )
 
 type CapabilitiesRegistry interface {
+	CapabilitiesRegistryBase
+	CapabilitiesRegistryMetadata
+}
+
+type CapabilitiesRegistryMetadata interface {
 	LocalNode(ctx context.Context) (capabilities.Node, error)
 	NodeByPeerID(ctx context.Context, peerID types.PeerID) (capabilities.Node, error)
 	ConfigForCapability(ctx context.Context, capabilityID string, donID uint32) (capabilities.CapabilityConfiguration, error)
-	CapabilitiesRegistryBase
 }
 
+
 type CapabilitiesRegistryBase interface {
 	GetTrigger(ctx context.Context, ID string) (capabilities.TriggerCapability, error)
 	Get(ctx context.Context, ID string) (capabilities.BaseCapability, error)
@@ -29,18 +34,21 @@ var _ CapabilitiesRegistry = UnimplementedCapabilitiesRegistry{}
 var _ CapabilitiesRegistryBase = UnimplementedCapabilitiesRegistryBase{}
 
 type UnimplementedCapabilitiesRegistry struct {
+	UnimplementedCapabilitiesRegistryMetadata
 	UnimplementedCapabilitiesRegistryBase
 }
 
-func (UnimplementedCapabilitiesRegistry) LocalNode(ctx context.Context) (capabilities.Node, error) {
+type UnimplementedCapabilitiesRegistryMetadata struct {}
+
+func (UnimplementedCapabilitiesRegistryMetadata) LocalNode(ctx context.Context) (capabilities.Node, error) {
 	return capabilities.Node{}, errors.New("LocalNode not implemented")
 }
 
-func (UnimplementedCapabilitiesRegistry) NodeByPeerID(ctx context.Context, peerID types.PeerID) (capabilities.Node, error) {
+func (UnimplementedCapabilitiesRegistryMetadata) NodeByPeerID(ctx context.Context, peerID types.PeerID) (capabilities.Node, error) {
 	return capabilities.Node{}, errors.New("NodeByPeerID not implemented")
 }
 
-func (UnimplementedCapabilitiesRegistry) ConfigForCapability(ctx context.Context, capabilityID string, donID uint32) (capabilities.CapabilityConfiguration, error) {
+func (UnimplementedCapabilitiesRegistryMetadata) ConfigForCapability(ctx context.Context, capabilityID string, donID uint32) (capabilities.CapabilityConfiguration, error) {
 	return capabilities.CapabilityConfiguration{}, errors.New("ConfigForCapability not implemented")
 }