Refactored for Maven.