Updated for Maven