Fixed the table structure