Refactoring pom
Improving transitive dependencies