Refactoring and updated dependencies.