Update to work with Drupal 7