Modify autoCommit handling