Further reduce load on EDataServer