Updated and simplified poms