Adds some jumps handling