Updated for default cell identifier of nil