Work on ESWrapperService