Refactored POM