Adding mark/jump support