Improve WavLoader and directory GlobalLoader