new database structure AND new modules