Should table be changed to list?