Add File fields (size); Refactor.