Adding more models
Fixing conflict