Add file entities and other