Feature/extra media fields