Mavenize
Update and refactor
Mavenize
Better giant persistance handling