All objects refactored to entity