Add entity data structs