Added Wavelet Support