add some more part of the Drupal 6 codebase