Added methods to Entity