pom refactoring & app support