Minor entity optimization.