Changed save format to JSON