Changed the drupal queries to use commerce tables.
Added dependency on commerce_payment