Improvements to POM