started refactoring of enumerable dependencies