Refactoring template
Updating dependencies