Started refactoring to changes in dependencies.