POM refactoring.