Refactoring service
Updating dependencies