Drupal Commerce Improvement