Refactoring template
Refactoring
Updating dependencies