Use newer aws plugin and proper service wrapper for ES