Fixed model, added entries from db, added new db generate scripts