Fixed base entity.
Increased entity count.
merge.