Made a small bugfix and some improvements to support the change patterns