Updates to suit drupal