Dramatically improve Reverb support