Move Opensearch support