POMs General refactor