POM Refactoring