New Callbacks, onChange and onSet
Changed code according to new version