Improve Drupal Service lib