diff --git a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
index 1487f3c..606f8bc 100644
--- a/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
+++ b/invoice/src/main/resources/org/killbill/billing/invoice/ddl.sql
@@ -77,8 +77,12 @@ CREATE TABLE invoice_payments (
CREATE UNIQUE INDEX invoice_payments_id ON invoice_payments(id);
CREATE INDEX invoice_payments_invoice_id ON invoice_payments(invoice_id);
CREATE INDEX invoice_payments_reversals ON invoice_payments(linked_invoice_payment_id);
+CREATE INDEX invoice_payments_payment_id ON invoice_payments(payment_id);
+CREATE INDEX invoice_payments_payment_cookie_id ON invoice_payments(payment_cookie_id);
CREATE INDEX invoice_payments_tenant_account_record_id ON invoice_payments(tenant_record_id, account_record_id);
+
+
DROP TABLE IF EXISTS invoice_parent_children;
CREATE TABLE invoice_parent_children (
record_id serial unique,
diff --git a/invoice/src/main/resources/org/killbill/billing/invoice/migration/V20161208173933__invoice_payment_idx.sql b/invoice/src/main/resources/org/killbill/billing/invoice/migration/V20161208173933__invoice_payment_idx.sql
new file mode 100644
index 0000000..a9c3c99
--- /dev/null
+++ b/invoice/src/main/resources/org/killbill/billing/invoice/migration/V20161208173933__invoice_payment_idx.sql
@@ -0,0 +1,2 @@
+CREATE INDEX invoice_payments_payment_id ON invoice_payments(payment_id);
+CREATE INDEX invoice_payments_payment_cookie_id ON invoice_payments(payment_cookie_id);
