Switch to JSON format
Fix problem with new config