improve support of external ES