Adjust table structures