Initial infra for master recovery