Refactor of all entity objects.