#12 Revise index annotation parsing