Shape => Entity
Fix entity modifier benchmark
Fix entity modifier benchmark