Improves the ES code paths