Change Key to Id on FileEntry
Remove auto-index