Add indexing of file base name and extension