Changes in the DB models; Avatar are done