UPD: new database structure