Re-added the automatic confirm handlers