Fixed columns in the db, added models