Make table more efficient