Added project and drupal6 classes