Updated: Mavenize