Add Drupal support
Standardize supported list order
v1.8, Drupal 6 fixes