Further development for drupal integration