New database structure for 4.1.0 release