Updates to align with Drupal portion of the site