Added music support