pom changes and refactoring