Update for ES 0.90.3 compatibility