Some changes to support ending identified sessions