Add EntityArray and rework variables.