Added overloads and fixed issues with save/load logic