Changed the purpose and the relationships of media, media_display and media_type