diff --git a/lib/wp/policy.c b/lib/wp/policy.c
index 7149c1a735108f0ab6242875806390e20e3754e0..f44b4437526a7f65ee9aa9411bb5bbdbff8bc19a 100644
--- a/lib/wp/policy.c
+++ b/lib/wp/policy.c
@@ -120,8 +120,8 @@ wp_policy_manager_get_instance (WpCore *core)
     mgr = g_object_new (WP_TYPE_POLICY_MANAGER, NULL);
 
     /* install the object manager to listen to added/removed endpoints */
-    wp_object_manager_add_interest (mgr->endpoints_om,
-        WP_TYPE_BASE_ENDPOINT, NULL, 0);
+    wp_object_manager_add_interest_1 (mgr->endpoints_om,
+        WP_TYPE_BASE_ENDPOINT, NULL);
     g_signal_connect_object (mgr->endpoints_om, "object-added",
         (GCallback) policy_mgr_endpoint_added, mgr, 0);
     g_signal_connect_object (mgr->endpoints_om, "object-removed",
@@ -129,8 +129,10 @@ wp_policy_manager_get_instance (WpCore *core)
     wp_core_install_object_manager (core, mgr->endpoints_om);
 
     /* install the object manager to listen to changed sessions */
-    wp_object_manager_add_interest (mgr->sessions_om,
-        WP_TYPE_IMPL_SESSION, NULL,
+    wp_object_manager_add_interest_1 (mgr->sessions_om,
+        WP_TYPE_IMPL_SESSION, NULL);
+    wp_object_manager_request_proxy_features (mgr->sessions_om,
+        WP_TYPE_IMPL_SESSION,
         WP_PROXY_FEATURES_STANDARD | WP_PROXY_FEATURE_CONTROLS);
     wp_core_install_object_manager (core, mgr->sessions_om);
 
diff --git a/modules/module-client-permissions.c b/modules/module-client-permissions.c
index 745b3114edcf24ccebb3f9a59836624be7ee4f1b..f83510abe7e8724efe441cd364b9c91041a034c5 100644
--- a/modules/module-client-permissions.c
+++ b/modules/module-client-permissions.c
@@ -33,7 +33,8 @@ wireplumber__module_init (WpModule * module, WpCore * core, GVariant * args)
   WpObjectManager *om;
 
   om = wp_object_manager_new ();
-  wp_object_manager_add_interest (om, WP_TYPE_CLIENT, NULL,
+  wp_object_manager_add_interest_1 (om, WP_TYPE_CLIENT, NULL);
+  wp_object_manager_request_proxy_features (om, WP_TYPE_CLIENT,
       WP_PROXY_FEATURES_STANDARD);
 
   g_signal_connect (om, "object-added", (GCallback) client_added, NULL);
diff --git a/modules/module-config-endpoint/context.c b/modules/module-config-endpoint/context.c
index 57d671155744bb703c4ad95aa6fe41f1363dd1e1..d11e8212dcda0d070902c9cf12f05f6bb5891fcc 100644
--- a/modules/module-config-endpoint/context.c
+++ b/modules/module-config-endpoint/context.c
@@ -260,7 +260,8 @@ wp_config_endpoint_context_init (WpConfigEndpointContext *self)
       g_direct_equal, NULL, (GDestroyNotify) g_object_unref);
 
   /* Only handle augmented nodes with info set */
-  wp_object_manager_add_interest (self->om, WP_TYPE_NODE, NULL,
+  wp_object_manager_add_interest_1 (self->om, WP_TYPE_NODE, NULL);
+  wp_object_manager_request_proxy_features (self->om, WP_TYPE_NODE,
       WP_PROXY_FEATURES_STANDARD);
 
   /* Register the global added/removed callbacks */
diff --git a/modules/module-config-static-nodes/context.c b/modules/module-config-static-nodes/context.c
index b4c82c7707801a129e25ee73ad139b166316bb7f..6a7ce47beb618d4ff2fe67f5918645a382537928 100644
--- a/modules/module-config-static-nodes/context.c
+++ b/modules/module-config-static-nodes/context.c
@@ -213,8 +213,9 @@ wp_config_static_nodes_context_init (WpConfigStaticNodesContext *self)
   self->devices_om = wp_object_manager_new ();
 
   /* Only handle devices */
-  wp_object_manager_add_interest (self->devices_om,
-      WP_TYPE_DEVICE, NULL, WP_PROXY_FEATURE_INFO);
+  wp_object_manager_add_interest_1 (self->devices_om, WP_TYPE_DEVICE, NULL);
+  wp_object_manager_request_proxy_features (self->devices_om, WP_TYPE_DEVICE,
+      WP_PROXY_FEATURE_INFO);
   g_signal_connect (self->devices_om, "object-added",
       (GCallback) on_device_added, self);
 }
diff --git a/tests/wp/endpoint.c b/tests/wp/endpoint.c
index 7429591f92e98a8443f5433c41057a6cab2a5521..056a572c96eddfe7867feaeb68156955282acb2d 100644
--- a/tests/wp/endpoint.c
+++ b/tests/wp/endpoint.c
@@ -287,9 +287,9 @@ test_endpoint_basic (TestEndpointFixture *fixture, gconstpointer data)
       (GCallback) test_endpoint_basic_impl_object_added, fixture);
   g_signal_connect (fixture->export_om, "object-removed",
       (GCallback) test_endpoint_basic_impl_object_removed, fixture);
-  wp_object_manager_add_interest (fixture->export_om,
-      WP_TYPE_ENDPOINT, NULL,
-      WP_PROXY_FEATURES_STANDARD | WP_PROXY_FEATURE_CONTROLS);
+  wp_object_manager_add_interest_1 (fixture->export_om, WP_TYPE_ENDPOINT, NULL);
+  wp_object_manager_request_proxy_features (fixture->export_om,
+      WP_TYPE_ENDPOINT, WP_PROXY_FEATURES_STANDARD | WP_PROXY_FEATURE_CONTROLS);
   wp_core_install_object_manager (fixture->base.core, fixture->export_om);
 
   /* set up the proxy side */
@@ -297,8 +297,8 @@ test_endpoint_basic (TestEndpointFixture *fixture, gconstpointer data)
       (GCallback) test_endpoint_basic_proxy_object_added, fixture);
   g_signal_connect (fixture->proxy_om, "object-removed",
       (GCallback) test_endpoint_basic_proxy_object_removed, fixture);
-  wp_object_manager_add_interest (fixture->proxy_om,
-      WP_TYPE_ENDPOINT, NULL,
+  wp_object_manager_add_interest_1 (fixture->proxy_om, WP_TYPE_ENDPOINT, NULL);
+  wp_object_manager_request_proxy_features (fixture->proxy_om, WP_TYPE_ENDPOINT,
       WP_PROXY_FEATURES_STANDARD | WP_PROXY_FEATURE_CONTROLS);
   wp_core_install_object_manager (fixture->base.client_core, fixture->proxy_om);
 
diff --git a/tests/wp/proxy.c b/tests/wp/proxy.c
index d10fad5b64fabe3512462d75b1ccd6e1acb44133..3e816a764871ece751fe6e1564072cfe5d65ecf9 100644
--- a/tests/wp/proxy.c
+++ b/tests/wp/proxy.c
@@ -83,7 +83,7 @@ test_proxy_basic (TestProxyFixture *fixture, gconstpointer data)
   g_signal_connect (fixture->om, "object-added",
       (GCallback) test_proxy_basic_object_added, fixture);
 
-  wp_object_manager_add_interest (fixture->om, WP_TYPE_CLIENT, NULL, 0);
+  wp_object_manager_add_interest_1 (fixture->om, WP_TYPE_CLIENT, NULL);
   wp_core_install_object_manager (fixture->base.core, fixture->om);
 
   g_main_loop_run (fixture->base.loop);
@@ -184,8 +184,9 @@ test_node (TestProxyFixture *fixture, gconstpointer data)
 
   /* declare interest and set default features to be ready
      when the signal is fired */
-  wp_object_manager_add_interest (fixture->om,
-      WP_TYPE_NODE, NULL, WP_PROXY_FEATURES_STANDARD);
+  wp_object_manager_add_interest_1 (fixture->om, WP_TYPE_NODE, NULL);
+  wp_object_manager_request_proxy_features (fixture->om, WP_TYPE_NODE,
+      WP_PROXY_FEATURES_STANDARD);
   wp_core_install_object_manager (fixture->base.core, fixture->om);
 
   g_main_loop_run (fixture->base.loop);
diff --git a/tests/wp/session.c b/tests/wp/session.c
index e07834ec8f50496ccb1c77cbe9766ef11ad27ab0..75b0f393b0f14f0b0cb4d4231e939216730f2d37 100644
--- a/tests/wp/session.c
+++ b/tests/wp/session.c
@@ -150,9 +150,10 @@ test_session_basic (TestSessionFixture *fixture, gconstpointer data)
       (GCallback) test_session_basic_exported_object_added, fixture);
   g_signal_connect (fixture->export_om, "object-removed",
       (GCallback) test_session_basic_exported_object_removed, fixture);
-  wp_object_manager_add_interest (fixture->export_om,
-      WP_TYPE_IMPL_SESSION, NULL,
-      WP_SESSION_FEATURES_STANDARD);
+  wp_object_manager_add_interest_1 (fixture->export_om,
+      WP_TYPE_IMPL_SESSION, NULL);
+  wp_object_manager_request_proxy_features (fixture->export_om,
+      WP_TYPE_IMPL_SESSION, WP_SESSION_FEATURES_STANDARD);
   wp_core_install_object_manager (fixture->base.core, fixture->export_om);
 
   /* set up the proxy side */
@@ -160,9 +161,9 @@ test_session_basic (TestSessionFixture *fixture, gconstpointer data)
       (GCallback) test_session_basic_proxy_object_added, fixture);
   g_signal_connect (fixture->proxy_om, "object-removed",
       (GCallback) test_session_basic_proxy_object_removed, fixture);
-  wp_object_manager_add_interest (fixture->proxy_om,
-      WP_TYPE_SESSION, NULL,
-      WP_SESSION_FEATURES_STANDARD);
+  wp_object_manager_add_interest_1 (fixture->proxy_om, WP_TYPE_SESSION, NULL);
+  wp_object_manager_request_proxy_features (fixture->proxy_om,
+      WP_TYPE_SESSION, WP_SESSION_FEATURES_STANDARD);
   wp_core_install_object_manager (fixture->base.client_core, fixture->proxy_om);
 
   /* create session */