new updated database structure