Improving WAV support