Updated to include custom cells in default table index