Updated template entity for file fields
Final version