Feature/new table structure