Added store_plan calls