Refactored the way jump target indices are specified