Updated table structure