Changed structure, no <T> MediaFile anymore