Mavenization improvements