Improved pom.xml to support deployment