refactored POMs