Multiple ES versions support