Add timeout to change handler