Replaced the Wavelet class