Fix demoWave to return correct Map structure