Use backend data model and correct waver logic.