Refactor EntityList in FileService

Refactor EntityList in FileService