Refactor DEPENDENCIES