Adjustments following drupal client implementation