Added file indexing support