Further simplified the model, including add & commit ops