Refactored catalog API for indexing. Implemented file-based catalog.