Improve Drupal service