added more models
added more models
refactored