Updated Folder + File entities