Added wavelet support