Re factor change set id's (#244)