Some changes to refactor  on Digilist project