Changed the table structure