Updates to use the slightly altered mediaserver API