rebuild the models
Rebuilt but not tested parser