Refactored dependencies.