MASSIVE improvement in performance with many entities