Merge POM changes
Further POM refinement