Template refactoring
Updating dependencies