Added reload-on-failure feature