Update the Drupal client to use the new services