Added Finalization fields to model