Remove Single Point of Failure (SPoF)