Refactored poms