Changed ideal database structure