Pass old_plan to instrumentation
Add a partial for changing plans, add prorations