Updates to make saving faster and handle local files