Now using proper data structure for Wave header