NXP-10517: Use signal for change method