Added switch to disable accumulators for a plan (also to cli), bugfix and small api change