Add new Dao but not test. Remade db structure