Add proper save method