Generate Table Improvements