Added BaseEntity and changed "Files" to "File"