Better pom management