Mavenized and updated