Update for Drupal 7