changed the way entities are uploaded