Rewrite to not use MediaEpisode class