Refactoring and update of dependencies