- Minor update to Entity