Adding our other models
Merged changes