Improved the Drupal Module