Add correct mapping to indexing part of extraction script
Remove 'unimpl' section from di.py - no longer necessary