Improve YouTube integration