Drupal upgrade, new module inclusions