Added to Entity Class