Added media key support