Add indices for compatibility