Better support for playing the next song