model changes (need also add some fields to age)