diff --git a/services_keyauth.module b/services_keyauth.module
index 73ca55c..0e6be58 100644
--- a/services_keyauth.module
+++ b/services_keyauth.module
@@ -42,15 +42,17 @@ function services_keyauth_services_authentication_info() {
 function services_keyauth_menu() {
   $items = array();
 
-  $items['admin/build/services/keys'] = array(
+//$items['admin/build/services/keys'] = array(
+  $items['admin/build/services/%services_endpoint/keys'] = array( 
     'title'             => 'Keys',
     'description'       => 'Manage application access to site services.',
     'page callback'     => 'services_keyauth_admin_keys_list',
+    'page arguments'    => array(3),
     'access callback'   => 'services_keyauth_access',
     'type'              => MENU_LOCAL_TASK,
     'file'              => 'services_keyauth.admin.inc',
   );
-  $items['admin/build/services/keys/%'] = array(
+  $items['admin/build/services/%services_endpoint/keys/%'] = array(
     'title'             => 'Edit key',
     'access arguments'  => array('administer services'),
     'page callback'     => 'drupal_get_form',
@@ -58,23 +60,28 @@ function services_keyauth_menu() {
     'file'              => 'services_keyauth.admin.inc',
     'type'              => MENU_CALLBACK,
   );
-  $items['admin/build/services/keys/%/delete'] = array(
+//$items['admin/build/services/keys/%/delete'] = array(
+  $items['admin/build/services/%services_endpoint/keys/%/delete'] = array(
     'access arguments'  => array('administer services'),
     'page callback'     => 'drupal_get_form',
-    'page arguments'    => array('services_keyauth_admin_keys_delete_confirm', 4),
+  //'page arguments'    => array('services_keyauth_admin_keys_delete_confirm', 4),
+    'page arguments'    => array('services_keyauth_admin_keys_delete_confirm', 5),
     'file'              => 'services_keyauth.admin.inc',
     'type'              => MENU_CALLBACK,
   );
-  $items['admin/build/services/keys/list'] = array(
+//$items['admin/build/services/keys/list'] = array(
+  $items['admin/build/services/%services_endpoint/keys/list'] = array(
     'title'             => 'List',
     'type'              => MENU_DEFAULT_LOCAL_TASK,
     'access callback'   => 'services_keyauth_access',
     'weight'            => -10,
   );
-  $items['admin/build/services/keys/add'] = array(
+//$items['admin/build/services/keys/add'] = array(
+  $items['admin/build/services/%services_endpoint/keys/add'] = array(
     'title'             => 'Create key',
     'page callback'     => 'drupal_get_form',
-    'page arguments'    => array('services_keyauth_admin_keys_form'),
+  //'page arguments'    => array('services_keyauth_admin_keys_form'),
+    'page arguments'    => array('services_keyauth_admin_keys_form', 3),
     'access callback'   => 'services_keyauth_access',
     'type'              => MENU_LOCAL_TASK,
     'file'              => 'services_keyauth.admin.inc',