Improving es migrator helpers