Modified default table structure