[Finishes #54078959] Added indexes for instructions