pom changes and slight api changes