Changes to use official es client