killbill-memoizeit

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..ffb8cdd
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_account_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-account:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-account/0.5.1-SNAPSHOT/killbill-account-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-account/0.5.1-SNAPSHOT/killbill-account-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-account/0.5.1-SNAPSHOT/killbill-account-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_api_0_6_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_api_0_6_0_SNAPSHOT.xml
new file mode 100644
index 0000000..8c6f85c
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_api_0_6_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-api/0.6.0-SNAPSHOT/killbill-api-0.6.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-api/0.6.0-SNAPSHOT/killbill-api-0.6.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-api/0.6.0-SNAPSHOT/killbill-api-0.6.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..0ba8958
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_beatrix_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-beatrix:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-beatrix/0.5.1-SNAPSHOT/killbill-beatrix-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-beatrix/0.5.1-SNAPSHOT/killbill-beatrix-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-beatrix/0.5.1-SNAPSHOT/killbill-beatrix-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..445bfc2
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_catalog_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-catalog/0.5.1-SNAPSHOT/killbill-catalog-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-catalog/0.5.1-SNAPSHOT/killbill-catalog-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-catalog/0.5.1-SNAPSHOT/killbill-catalog-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_entitlement_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_entitlement_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..9d28aed
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_entitlement_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-entitlement:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-entitlement/0.5.1-SNAPSHOT/killbill-entitlement-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-entitlement/0.5.1-SNAPSHOT/killbill-entitlement-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-entitlement/0.5.1-SNAPSHOT/killbill-entitlement-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..f3686fa
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_invoice_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-invoice:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-invoice/0.5.1-SNAPSHOT/killbill-invoice-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-invoice/0.5.1-SNAPSHOT/killbill-invoice-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-invoice/0.5.1-SNAPSHOT/killbill-invoice-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..5af2fa2
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_junction_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-junction:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-junction/0.5.1-SNAPSHOT/killbill-junction-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-junction/0.5.1-SNAPSHOT/killbill-junction-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-junction/0.5.1-SNAPSHOT/killbill-junction-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..b9c057c
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_payment_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-payment/0.5.1-SNAPSHOT/killbill-payment-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-payment/0.5.1-SNAPSHOT/killbill-payment-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-payment/0.5.1-SNAPSHOT/killbill-payment-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_5_1_SNAPSHOT.xml
new file mode 100644
index 0000000..b73c4c9
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_killbill_util_test_jar_tests_0_5_1_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-util/0.5.1-SNAPSHOT/killbill-util-0.5.1-SNAPSHOT-tests.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-util/0.5.1-SNAPSHOT/killbill-util-0.5.1-SNAPSHOT-test-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/killbill-util/0.5.1-SNAPSHOT/killbill-util-0.5.1-SNAPSHOT-test-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_4_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_4_0_SNAPSHOT.xml
new file mode 100644
index 0000000..ae99ae7
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_notification_0_4_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-notification/0.4.0-SNAPSHOT/killbill-plugin-api-notification-0.4.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-notification/0.4.0-SNAPSHOT/killbill-plugin-api-notification-0.4.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-notification/0.4.0-SNAPSHOT/killbill-plugin-api-notification-0.4.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_4_0_SNAPSHOT.xml b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_4_0_SNAPSHOT.xml
new file mode 100644
index 0000000..c98d6ed
--- /dev/null
+++ b/.idea/libraries/Maven__com_ning_billing_plugin_killbill_plugin_api_payment_0_4_0_SNAPSHOT.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-payment/0.4.0-SNAPSHOT/killbill-plugin-api-payment-0.4.0-SNAPSHOT.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-payment/0.4.0-SNAPSHOT/killbill-plugin-api-payment-0.4.0-SNAPSHOT-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/ning/billing/plugin/killbill-plugin-api-payment/0.4.0-SNAPSHOT/killbill-plugin-api-payment-0.4.0-SNAPSHOT-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>
\ No newline at end of file

diff --git a/api/killbill-internal-api.iml b/api/killbill-internal-api.iml
index 8c2260d..9a838c5 100644
--- a/api/killbill-internal-api.iml
+++ b/api/killbill-internal-api.iml
@@ -13,6 +13,8 @@
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />

diff --git a/api/src/main/java/com/ning/billing/overdue/OverdueCancellationPolicy.java b/api/src/main/java/com/ning/billing/overdue/OverdueCancellationPolicy.java
new file mode 100644
index 0000000..285744e
--- /dev/null
+++ b/api/src/main/java/com/ning/billing/overdue/OverdueCancellationPolicy.java
@@ -0,0 +1,7 @@
+package com.ning.billing.overdue;
+
+public enum OverdueCancellationPolicy {
+    END_OF_TERM,
+    IMMEDIATE,
+    NONE
+}

diff --git a/beatrix/killbill-beatrix.iml b/beatrix/killbill-beatrix.iml
index 103ce23..5faecc4 100644
--- a/beatrix/killbill-beatrix.iml
+++ b/beatrix/killbill-beatrix.iml
@@ -25,6 +25,14 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-junction:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-account:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-invoice:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-junction:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />

diff --git a/entitlement/killbill-entitlement.iml b/entitlement/killbill-entitlement.iml
index 74e5c95..8103bc8 100644
--- a/entitlement/killbill-entitlement.iml
+++ b/entitlement/killbill-entitlement.iml
@@ -26,6 +26,11 @@
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />

diff --git a/junction/killbill-junction.iml b/junction/killbill-junction.iml
index 1cf83d7..3f53281 100644
--- a/junction/killbill-junction.iml
+++ b/junction/killbill-junction.iml
@@ -27,6 +27,12 @@
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-entitlement:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-entitlement:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />

diff --git a/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml b/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
index b979d01..7c0078e 100644
--- a/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
+++ b/osgi-bundles/bundles/jruby/killbill-osgi-bundles-jruby.iml
@@ -15,6 +15,9 @@
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.google.guava:guava:14.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />

diff --git a/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml b/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
index fbcbe1a..9966634 100644
--- a/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
+++ b/osgi-bundles/defaultbundles/killbill-osgi-bundles-defaultbundles.iml
@@ -15,6 +15,9 @@
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="module" module-name="killbill-osgi-bundles-jruby" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />

diff --git a/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml b/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
index cafae6a..b332c8e 100644
--- a/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
+++ b/osgi-bundles/libs/killbill/killbill-osgi-bundles-lib-killbill.iml
@@ -15,6 +15,8 @@
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.3.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />

diff --git a/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml b/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
index 74a9686..871a149 100644
--- a/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
+++ b/osgi-bundles/tests/payment/killbill-osgi-bundles-test-payment.iml
@@ -18,10 +18,6 @@
     <orderEntry type="library" name="Maven: com.ning.billing.commons:killbill-jdbi:0.1.7" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.3.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: joda-time:joda-time:2.0" level="project" />
     <orderEntry type="module" module-name="killbill-osgi-bundles-lib-killbill" />

diff --git a/overdue/killbill-overdue.iml b/overdue/killbill-overdue.iml
index af3075d..f86689c 100644
--- a/overdue/killbill-overdue.iml
+++ b/overdue/killbill-overdue.iml
@@ -25,6 +25,11 @@
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />

diff --git a/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java b/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java
index 394a851..1897491 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/applicator/OverdueStateApplicator.java
@@ -48,6 +48,7 @@ import com.ning.billing.overdue.config.api.BillingState;
 import com.ning.billing.overdue.config.api.OverdueException;
 import com.ning.billing.util.callcontext.InternalCallContext;
 import com.ning.billing.util.callcontext.InternalTenantContext;
+import com.ning.billing.util.dao.NonEntityDao;
 import com.ning.billing.util.email.DefaultEmailSender;
 import com.ning.billing.util.email.EmailApiException;
 import com.ning.billing.util.email.EmailConfig;
@@ -75,13 +76,14 @@ public class OverdueStateApplicator {
     private final AccountInternalApi accountApi;
     private final EntitlementApi entitlementApi;
     private final OverdueEmailGenerator overdueEmailGenerator;
-    final TagInternalApi tagApi;
+    private final TagInternalApi tagApi;
     private final EmailSender emailSender;
+    private final NonEntityDao nonEntityDao;
 
     @Inject
     public OverdueStateApplicator(final BlockingInternalApi accessApi, final AccountInternalApi accountApi, final EntitlementApi entitlementApi,
                                   final Clock clock, final OverdueCheckPoster poster, final OverdueEmailGenerator overdueEmailGenerator,
-                                  final EmailConfig config, final PersistentBus bus, final TagInternalApi tagApi) {
+                                  final EmailConfig config, final PersistentBus bus, final NonEntityDao nonEntityDao,  final TagInternalApi tagApi) {
         this.blockingApi = accessApi;
         this.accountApi = accountApi;
         this.entitlementApi = entitlementApi;
@@ -89,6 +91,7 @@ public class OverdueStateApplicator {
         this.poster = poster;
         this.overdueEmailGenerator = overdueEmailGenerator;
         this.tagApi = tagApi;
+        this.nonEntityDao = nonEntityDao;
         this.emailSender = new DefaultEmailSender(config);
         this.bus = bus;
     }
@@ -228,9 +231,9 @@ public class OverdueStateApplicator {
     }
 
     @SuppressWarnings("unchecked")
-    private void computeEntitlementsToCancel(final Account blockable, final List<Entitlement> result, final InternalTenantContext context) throws EntitlementApiException {
-        // STEPH_ENT fix internal API.
-        result.addAll(entitlementApi.getAllEntitlementsForAccountId(blockable.getId(), context.toTenantContext(null)));
+    private void computeEntitlementsToCancel(final Account account, final List<Entitlement> result, final InternalTenantContext context) throws EntitlementApiException {
+        final UUID tenantId = nonEntityDao.retrieveIdFromObject(context.getTenantRecordId(), ObjectType.TENANT);
+        result.addAll(entitlementApi.getAllEntitlementsForAccountId(account.getId(), context.toTenantContext(tenantId)));
     }
 
     private void sendEmailIfRequired(final BillingState billingState, final Account account,

diff --git a/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java b/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java
index 7b9fe94..32a4e19 100644
--- a/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java
+++ b/overdue/src/main/java/com/ning/billing/overdue/wrapper/OverdueWrapperFactory.java
@@ -34,6 +34,7 @@ import com.ning.billing.overdue.config.OverdueConfig;
 import com.ning.billing.overdue.config.api.OverdueException;
 import com.ning.billing.overdue.config.api.OverdueStateSet;
 import com.ning.billing.util.callcontext.InternalTenantContext;
+import com.ning.billing.util.svcapi.account.AccountInternalApi;
 import com.ning.billing.util.svcapi.junction.BlockingInternalApi;
 
 import com.google.inject.Inject;
@@ -42,7 +43,7 @@ public class OverdueWrapperFactory {
 
     private static final Logger log = LoggerFactory.getLogger(OverdueWrapperFactory.class);
 
-    private final AccountUserApi accountUserApi;
+    private final AccountInternalApi accountApi;
     private final BillingStateCalculator billingStateCalculator;
     private final OverdueStateApplicator overdueStateApplicator;
     private final BlockingInternalApi api;
@@ -53,10 +54,10 @@ public class OverdueWrapperFactory {
     public OverdueWrapperFactory(final BlockingInternalApi api, final Clock clock,
                                  final BillingStateCalculator billingStateCalculator,
                                  final OverdueStateApplicator overdueStateApplicatorBundle,
-                                 final AccountUserApi accountUserApi) {
+                                 final AccountInternalApi accountApi) {
         this.billingStateCalculator = billingStateCalculator;
         this.overdueStateApplicator = overdueStateApplicatorBundle;
-        this.accountUserApi = accountUserApi;
+        this.accountApi = accountApi;
         this.api = api;
         this.clock = clock;
     }
@@ -71,8 +72,7 @@ public class OverdueWrapperFactory {
     public OverdueWrapper createOverdueWrapperFor(final UUID id, final InternalTenantContext context) throws OverdueException {
 
         try {
-            // STEPH_ENT
-            Account account = accountUserApi.getAccountById(id, context.toTenantContext(null));
+            Account account = accountApi.getAccountById(id, context);
             return new OverdueWrapper(account, api, getOverdueStateSetBundle(),
                                       clock, billingStateCalculator, overdueStateApplicator);
 

diff --git a/server/killbill-server.iml b/server/killbill-server.iml
index 6d9a7bc..09c83af 100644
--- a/server/killbill-server.iml
+++ b/server/killbill-server.iml
@@ -29,6 +29,12 @@
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-beatrix:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-beatrix:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-payment:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-classic:1.0.1" level="project" />
     <orderEntry type="library" scope="RUNTIME" name="Maven: ch.qos.logback:logback-core:1.0.1" level="project" />
     <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.5" level="project" />

diff --git a/subscription/killbill-subscription.iml b/subscription/killbill-subscription.iml
index 9f2164a..3df74a9 100644
--- a/subscription/killbill-subscription.iml
+++ b/subscription/killbill-subscription.iml
@@ -26,6 +26,11 @@
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-catalog:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />

diff --git a/usage/killbill-usage.iml b/usage/killbill-usage.iml
index 2b730d2..2a484d8 100644
--- a/usage/killbill-usage.iml
+++ b/usage/killbill-usage.iml
@@ -22,6 +22,10 @@
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="TEST" name="Maven: com.ning.billing:killbill-util:test-jar:tests:0.5.1-SNAPSHOT" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:14.0.1" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.inject:guice:3.0" level="project" />
     <orderEntry type="library" scope="PROVIDED" name="Maven: javax.inject:javax.inject:1" level="project" />

diff --git a/util/killbill-util.iml b/util/killbill-util.iml
index 0782507..b190bbe 100644
--- a/util/killbill-util.iml
+++ b/util/killbill-util.iml
@@ -22,6 +22,9 @@
     <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing:killbill-api:0.6.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-payment:0.4.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: com.ning.billing.plugin:killbill-plugin-api-notification:0.4.0-SNAPSHOT" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-annotations:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-databind:2.1.0" level="project" />
     <orderEntry type="library" name="Maven: com.fasterxml.jackson.core:jackson-core:2.1.0" level="project" />