Simplify table indexing, no names for now