enhanced and refactored pom model