Standardised the Entity class