Refactored POM and updated dependencies
Optimized POM