Modified SaveManager