Adding node dependency
Finished refactoring