Added more EntityData