Refactoring...
Added indexed dependencies