diff --git a/include/zipr.h b/include/zipr.h
index 6cca4e6359b162bb469458ab3e426c9ea87155b9..ecd5676d40a36d05716df4f580e839875f980793 100644
--- a/include/zipr.h
+++ b/include/zipr.h
@@ -66,9 +66,22 @@ class Zipr_t
 		 * way want to use.
 		 */
 		virtual int DetermineWorstCaseInsnSize(libIRDB::Instruction_t*, bool account_for_jump = true) = 0;
-		virtual Zipr_SDK::RangeAddress_t PlopDollopEntry(Zipr_SDK::DollopEntry_t *) = 0;
-		virtual Zipr_SDK::RangeAddress_t PlopWithTarget(Zipr_SDK::DollopEntry_t*) = 0;
-		virtual Zipr_SDK::RangeAddress_t PlopWithCallback(DollopEntry_t *) = 0;
+
+		virtual Zipr_SDK::RangeAddress_t PlopDollopEntry(
+			DollopEntry_t *,
+			RangeAddress_t = 0)
+			= 0;
+
+		virtual Zipr_SDK::RangeAddress_t PlopDollopEntryWithTarget(
+			DollopEntry_t *,
+			RangeAddress_t = 0)
+			= 0;
+
+		virtual Zipr_SDK::RangeAddress_t PlopDollopEntryWithCallback(
+			DollopEntry_t *,
+			RangeAddress_t = 0)
+			= 0;
+
         	virtual Zipr_SDK::MemorySpace_t *GetMemorySpace()=0;
         	virtual ELFIO::elfio *GetELFIO()=0;
         	virtual libIRDB::FileIR_t *GetFileIR()=0;
diff --git a/include/zipr_plugin.h b/include/zipr_plugin.h
index 804a62ce5de49418152b33e50cf0c4cab0edba48..e64f76436aae98c2a4443835516468f99c36f8eb 100644
--- a/include/zipr_plugin.h
+++ b/include/zipr_plugin.h
@@ -40,12 +40,11 @@ class ZiprPluginInterface_t
 		{
 			return false;
 		}
-		virtual size_t WorstCaseInsnSize(libIRDB::Instruction_t*, Zipr_t *)
+		virtual size_t WorstCaseInsnSize(libIRDB::Instruction_t*, bool, Zipr_t *)
 		{
 			return 0;
 		}
-		virtual RangeAddress_t PlopInstruction(libIRDB::Instruction_t*,
-			RangeAddress_t,
+		virtual RangeAddress_t PlopDollopEntry(Zipr_SDK::DollopEntry_t *,
 			RangeAddress_t &,
 			Zipr_t *)
 		{