Add persistent server UUID support