Improved save method