Renamed Object to Entity