Add correct entity types
Make it impossible for not owners to remove a file