Refactor Wave to add OnWave annotation support