Added JSON import and export