[MOD] Extending onchanges