Various stuff around new changes mechanism