Added Save/Load Authentication support