Add catalog index and indexers.
Update bootstrap.py