Altered dora models to use many-to-many field