Upgrade for ES0.90.4