Update for support with Drupal Core