Improved pom.xml