Rebuilt the models for the "mavenized" version