Improved parsing for pse indeces