Now with Media Key support