Added support for onChanged event