Combine all ingredients except avocados in a large bowl and mix well. Cover and chill for a few hours or overnight. Right before serving, add avocados and mix gently, being careful not to mash avocados. Garnish with a few sprigs of freshly chopped cilantro if desired. Serve at room temperature.