Some prep to support SoundCloud