AS: POM refactoring