Generate Table Improvments