Better table name gathering