Adding file naming and indexing