Improved ES support