Add index
Fix pluralization