New db structure + Pre insert agregation