More work done on CommitmentModel