Converted to simpler json-based configuration