PLT-492 Indices for Fx

Enhance from PR