Changes for secondary local indexes