upd models and DB consolidation