Make compatible with embedded=2 parameter
Add new model AccumulatorFull