Aws plugin code V1 updated