refactored to reflec the API change
fix POM