Update Model Hierarchy
Refactor processAction to processWave