Added better saving support