Add drupal_education and other changes