Updated with iTunes support