Added entity data functions