Converted table/collection stuff to use indexPaths